Merge changes from topic "am-79e52fb1da4842749d8aff189d23a029" into android12-tests-dev am: e4b2194520 -s ours

am skip reason: Merged-In I5aa4c1da177eb3ea51a1bc3242eebe1afcd0d1ac with SHA-1 19e1e33bdb is already in history

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

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