Merge changes from topic "am-824c45b1039f417598429adc4cef821a" into android11-tests-dev am: 6eaa3b48e9

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

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