[automerger skipped] Merge changes from topic "am-15cb99cc4d4c429085be893ac571ecd0" into oreo-mr1-cts-dev am: 9ba7ea0b4c -s ours am: e702655798 -s ours am: bb2a72f846 -s ours am: 6fc30a190b -s ours am: 780c19eb99 -s ours am: 507986de6e -s ours am: 6a063b523f -s ours am: 0c6fdcf4cf -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: Ideb79dc9ac68444c98e1f2752c8c2da909b92c99