[automerger skipped] Merge TQ1A.221205.012 am: 60d9b609a0 -s ours

am skip reason: Merged-In I6f8f117b00a656d7e584e4607def8467908566fd with SHA-1 fc167a99f8 is already in history

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

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