Merge "new telephonyRegistryManager" am: 695838c4d9
am: 5048686f3b

Change-Id: I7700de58cb934b8f9da706af6d154c54eaef48fa