Merge "[BACKPORT] Improve location checks in TelephonyRegistry" into rvc-dev am: 21a1916717

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11589690

Change-Id: I531e7170550a9c7461b24eeee6d7818848122bc3