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

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

Change-Id: I1af8eb959558a50f1bb293fd40f9b4ca42234d71