Merge "Improve location checks in TelephonyRegistry"