Merge "Renamed methods for clarification" am: 561a505da5 am: db5daeb98e

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

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