Merge changes from topic "am-c21cfd67b7fc45299f9d53a6dcb7e7b4" into android11-tests-dev am: b179993c26 -s ours

am skip reason: Merged-In I46902801b8a6388f7841309547d8d767ee9e95e9 with SHA-1 25871c4ef3 is already in history

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

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