Merge "Merge branch 'expected_upstream' into aosp/master" am: 2ad860a425 am: 014cd72a4b

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

Change-Id: I41c41be5475893b1374489d237fb71946a8b526d