Merge changes from topic "unused_sm_methods" am: 9e760081

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



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