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

Change-Id: I054a5b30575301a0d4871bf2394d26b5a6a8bc49