Merge "Resolve hidden TelephonyRegistryManager APIs" into main