[automerger skipped] Merge "Renamed methods for clarification" am: 08451a12...

[automerger skipped] Merge "Renamed methods for clarification" am: 08451a12 am: 9448c6af am: 2f4c44a0 -s ours am: 21c26bd5 -s ours am: a00ef82c -s ours

am skip reason: Merged-In Iefbf99da50eb7575234d03a36bd65d2e34a76b41 with SHA-1 790f2329 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2470127



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