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

[automerger skipped] Merge "[DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry" into qt-dev am: 0b5b9eed am: e45ec287 -s ours am: 94e5401f -s ours am: 96631660 -s ours am: e4d49160 -s ours

am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 81bab8b8 is in history

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

Change-Id: I3092e00e2f64a4b13ff641f6e855883fcd55f35c