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

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

Change-Id: I549537e41eec3f82a20f5d59472fdc05c94096c0