Merge changes from topic "am-36d7512aa897466ca33c482faaf8d713" into android13-tests-dev am: bb1f722c92 Original change: https://android-review.googlesource.com/c/platform/libcore/+/4040063 Change-Id: I5c67533e9bff1aea1051bebf8b41123d1c69decf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>