Merge "[BACKPORT] Improve location checks in TelephonyRegistry" into rvc-dev