Merge changes from topic "am-960e3c7835da42969d560c97940929d4" into android12L-tests-dev am: 3b80e9f4ba -s ours

am skip reason: Merged-In I467ba93d32c5635849f05f282e79e6842eb3934e with SHA-1 18467ce356 is already in history

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

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