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

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

Change-Id: Ifefea63b58ddafa93a030de4b396a0e4e189e5e7