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

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

Change-Id: Iae5b2018a7765647953cb2769daf7ca246edfed6