Merge changes from topic "am-a484a39e98954643a9144940c8ff7fec" into android12L-tests-dev am: d215507349 -s ours

am skip reason: Merged-In Ie29f457fcaf795a9c024f6fdd8ae0cbf161e36d7 with SHA-1 18b662a689 is already in history

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

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