Merge "Delete unused method #cleanup" into tm-qpr-dev am: 939a2a954d

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

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