[automerger skipped] Merge "[BACKPORT] Improve location checks in TelephonyRegistry" into rvc-dev am: 21a1916717 am: 1c3a84f72b -s ours
am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 4e0c7d16fd is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11589690
Change-Id: I1ab5a5a4feb7e79f9ffc0bf6de147446290343c3
This commit is contained in: