Merge "Remove deprecated, hidden versions of changed public APIs." into sc-dev am: c630f87976

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15259893

Change-Id: I79a00bd0125fb8839f301a9393e27eed18232503