[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: 9a34dd68 am: e66c1f7e -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: Idb51634ab5e3e490ac6aeb5b23d14558ccea0cee