[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 814fca5bba -s ours am: 8e048ceb57 -s ours am: 08145b3f7a -s ours

am skip reason: Merged-In If01f87c68f2ba0518fc256fffa785c9cd6f699ee with SHA-1 d76e2a3718 is already in history

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

Change-Id: Ifad080c35bc871a3b341a0509aae4f9da54d0cd8