Merge "Rename the methods to easier understand what they do" into tm-qpr-dev am: 0b673f9e

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



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