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

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

Change-Id: Ic8e19f4516eb4ca9ac1bc8cd58462e3078473912