Merge changes I2233f904,I8e91a2a2,I990b1192 am: 9b372314ac

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

Change-Id: If2ab446102ea7d9a6474be40b2086aa7a9dd6847