Merge changes from topic "am-2055605ac97e4ed0a8abd4c540da31af" into android12L-tests-dev am: d849e3520c -s ours

am skip reason: Merged-In I46902801b8a6388f7841309547d8d767ee9e95e9 with SHA-1 0f5026d5b4 is already in history

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

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