Merge changes from topic "StablizeLibcoreSystemApi2" into sc-dev am: bbd3532c84

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

Change-Id: Ib3672b93cee5d395d78b6c45a48c9ac03ee28810