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

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

Change-Id: I35d43ee95f3814174afae8dd9e39aec0471b608d