[automerger skipped] Merge changes from topic "am-bb023bf707f940a9a914fc438b9399a9" into android12-tests-dev am: dfb7f121dc -s ours am: 73906f134e -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: I13cda565b9d19633441ab2d75a7572fb05ec48e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>