Merge "[DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry" into qt-dev am: 0b5b9ee

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

Change-Id: If8b87dc5468c0f0d9c0fd93df2c116f08e080349

Author: Nathan Harold