[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 5a3ce17a7e -s ours

am skip reason: Merged-In If1528d09fa8788b8f70ff4e676062297aabe77e0 with SHA-1 833a0b75b2 is already in history

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

Change-Id: I2b6e1f92f4b70d7405e4f87bdf9c34de2702c284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>