[automerger skipped] Merge changes from topic "am-308359f326c24ca7b980ccf0c186c960" into android12L-tests-dev am: 4ad5404d13 -s ours

am skip reason: Merged-In Ib9db60c139d035f9f56a6c59053f1a4f85786f74 with SHA-1 3ad0487e56 is already in history

Original change: https://android-review.googlesource.com/c/platform/libcore/+/2746300

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