Merge "Hide TelephonyRegistryManager." into rvc-dev am: cc7682bd15

Change-Id: I41abdb3958da056ce8a58fb353af07310b370ea3