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

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

Change-Id: I308c049fc821ac4b6ac0f75a6279dbc77e4588af