[automerger skipped] Merge changes from topic "am-98c2fa31b1774177893a0478969b96cd" into pie-cts-dev am: 75ac3930a5 -s ours am: c31817fef8 -s ours am: 70b1308c7e -s ours am: f5ec681635 -s ours am: 1a1d1d7724 -s ours am: 239096cde3 -s ours am: ab5ef80835 -s ours

am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history

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

Change-Id: If65faa074b816c61ed6eb3bf197fd18f46fe5dba