Merge changes from topic "am-f116f6daf3bd4f109638f1ee3d9e2bd2" into android12-tests-dev am: b52640372e -s ours

am skip reason: Merged-In Ie29f457fcaf795a9c024f6fdd8ae0cbf161e36d7 with SHA-1 6d0d0a3521 is already in history

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

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