[automerger skipped] Merge "Rename the methods to easier understand what they...

[automerger skipped] Merge "Rename the methods to easier understand what they do" into tm-qpr-dev am: 0b673f9e am: 8378cdbd -s ours

am skip reason: Merged-In Id7db3a0dc9c2a17276ae213223fa3dd6ae572b9f with SHA-1 0d7aa31d is already in history

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



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