Merge changes from topic "am-344d8e243d634799a1fff5d69745bbb7" into android13-tests-dev am: f6d9d9e53a -s ours

am skip reason: Merged-In Ib9db60c139d035f9f56a6c59053f1a4f85786f74 with SHA-1 19d34fd0cc is already in history

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

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