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

am skip reason: subject contains skip directive

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

Change-Id: I25b34764ce4c9ba4baa91c2bbed270d5c76b689b