[automerger skipped] [DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry am: 81bab8b849 am: e1a23c7ef6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6fb22f36f2615f337699817083991ba741a3938e