Merge changes from topic "CorePlatformApiDocChanges" into sc-dev am: a3501d6174

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

Change-Id: I065b34a493af8271685162ded62d3e75de52eb90