DO NOT MERGE - Merge ab/7272582 am: 4ffb368e50

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

Change-Id: I72ab620a7f1cb47f2b3ea7ca5995816d01a31732