[automerger skipped] Merge "[BACKPORT] Improve location checks in...

[automerger skipped] Merge "[BACKPORT] Improve location checks in TelephonyRegistry" into rvc-dev am: 21a19167 am: c96eba62 am: a76dee43 -s ours

am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 cc584e77 is in history

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

Change-Id: Ic5c8f4af1122278812cfb121e6081742b3ba3622