Merge "Temporarily re-add methods and classes removed in ag/1420175." into...

Merge "Temporarily re-add methods and classes removed in ag/1420175." into sc-dev am: e78d13af am: 832790d8

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

Change-Id: Ie1dee56321c9500e7bcf6cf18282eed0c2fe6304