Merge changes I240273ff,I5323bc5c,I9ed80903 am: fc36f57b18 am: 697a500874 am: bdf4707a42

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

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