Merge "[DO NOT MERGE] Remove unused methods" into tm-qpr-dev am: b5b18930

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



Change-Id: I6d1c7d3ec3681d61559776a2612e39644e37444e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>