[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: 2b9cdbf9 -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: I8cc5d5cf6af39d61d887e04017574cd0c97ef0a8