[automerger skipped] [DO NOT MERGE][BACKPORT]Improve location checks in...

[automerger skipped] [DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry am: 81bab8b8 am: e1a23c7e -s ours am: d5bb4990 -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/+/12664597

Change-Id: I605e9b72eb6a090fa40aea83fc885d8590808a44