[automerger skipped] Merge changes from topic "unused_sm_methods" am:...

[automerger skipped] Merge changes from topic "unused_sm_methods" am: 9e760081 am: 48c8df8a am: b790cd6b -s ours am: 6beb9e63 -s ours

am skip reason: Merged-In I1e4110e4bb7dbbc05d51f75d67f451a8ce3bf229 with SHA-1 40dfa973 is already in history

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



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