[automerger skipped] Merge "Removed unused method" am: 86198033 am:...

[automerger skipped] Merge "Removed unused method" am: 86198033 am: 27664fa3 am: e14c0ef7 -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: I419add49cf4ceaefa818bc8e13037721d4d9a0d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>