[automerger skipped] Merge changes from topic "am-5c39dcf2db604d5cbc65f245e4891279" into android12-tests-dev am: 6b8993a59d -s ours am: b51a05081b -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/+/2194740

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