[automerger skipped] Merge "Renamed methods for clarification" am: 561a505da5 am: db5daeb98e am: 72364154a6 -s ours am: cc22939d03 -s ours

am skip reason: Merged-In I73e31e42cd230d9c60fc6df7a7b4ed5a3e2f8b0f with SHA-1 e84aa0eb3f is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2470128

Change-Id: I10fd321baa573ab2529a52823d504d44fafb8c77
Signed-off-by: Automerger Merge Worker <[email protected]>