Merge changes from topic "am-c0fd540477fb4dea83351368d8d0985c" into android12L-tests-dev am: 8f0417e5c9

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

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