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

Change-Id: Ic48703e0ab93b47203348b633f8f402dc1cfd4ad