[automerger skipped] Merge "Renamed methods for clatification" am: f8db4fe1 am: e3caa55d am: e8011bd7 -s ours am: 649a3e61 -s ours am: 3732de0f -s ours

am skip reason: Merged-In Idf33e6db48e7ccba72b5e389039f68011949938a with SHA-1 983f9f99 is already in history

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



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