[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 8b5d3ff40e -s ours am: a6e23af062 -s ours am: 6157168356 -s ours

am skip reason: Change-Id Iaca4fd52da6ff744f745bb835a1f58b9091063c5 with SHA-1 d8b4afeae4 is in history

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

Change-Id: Iae47878f8f8022f4a7c0f72fb08321369f82fa27