Merge "[automerger skipped] Merge changes from topic "am-15cb99cc4d4c429085be893ac571ecd0" into oreo-mr1-cts-dev am: 9ba7ea0b4c -s ours" into pie-cts-dev am: 5b3d134769 -s ours am: 80489e72ce -s ours am: 29b5232a46 -s ours am: 42d92fc09a -s ours am: 53515c0fec -s ours

am skip reason: Change-Id If6a2dbb615a70739350cbae91cc33754afe2b793 with SHA-1 044bd5e685 is in history

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

Change-Id: I8123b792338e0c3e75f806b719e35fa17814e01c