Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev