[automerger skipped] Merge "Renamed methods for clatification" am: f8db4fe14c am: e3caa55db1 am: e8011bd74c -s ours
am skip reason: Merged-In Idf33e6db48e7ccba72b5e389039f68011949938a with SHA-1 983f9f9925 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2470984
Change-Id: I355489edb6ea2ae1b79bb6dc34157e36ca8f4e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: