[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: 9a90eb08 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I51b87322be3b23689d3d538c105ed598c16b83b7