Merge changes from topic "am-3e05d71f14954bc1afbc82c7e8574e25" into android12L-tests-dev am: 15f1adeeff -s ours

am skip reason: Merged-In Ib9db60c139d035f9f56a6c59053f1a4f85786f74 with SHA-1 19d34fd0cc is already in history

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

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