[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: d76e095b -s ours am: 410f455b -s ours am: 34fd4ca3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2d186980257238806baad4aebb7bf420b21e05da