Merge changes from topic "am-1d9559f1bd9b41518efae09f1f0bc532" into android12L-tests-dev am: 68c2fd5370 -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/+/2193005

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