Merge "Delete unused method #cleanup" into tm-qpr-dev am: 939a2a95 am: 06114f17

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



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