Merge changes from topic "am-648ebe5686134a31a84e885529cbbfca" into android10-tests-dev am: b2176e1aa4

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

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