Merge "Merge branch 'expected_upstream' into aosp/master" am: 1a127724f4

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

Change-Id: I285e7836b5c30529b46a298bc3b0facc7035822d