[automerger skipped] Merge changes from topic "cherrypicker-L35000000962971612:N04200001403494768" into android13-tests-dev am: 49acb35b08 -s ours

am skip reason: Merged-In Ib9db60c139d035f9f56a6c59053f1a4f85786f74 with SHA-1 8b41797ecf is already in history

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

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