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