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

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

Change-Id: Iccb881e1312568aac4c2657257cfcc5cf2fab7d7