Merge "Hide TelephonyRegistryManager." into rvc-dev