[automerger skipped] Merge "Removed unused method" am: 86198033 am: 27664fa3 am: e14c0ef7 -s ours am: 1b95095c -s ours am: 6c67cce4 -s ours

am skip reason: Merged-In I70a26d424eca093921572ce610ea495f603b01c6 with SHA-1 07fc4b48 is already in history

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



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