[automerger skipped] Merge Android 12 am: 0542c7d495 -s ours am: d0d2dafde4 -s ours

am skip reason: Merged-In Icf16224e798492e78d32717df442b033d005ddaa with SHA-1 814fca5bba is already in history

Original change: https://android-review.googlesource.com/c/platform/external/ksoap2/+/1847426

Change-Id: I1375397ff5d8359ea53229c9fef00be15e1746eb