Merge "new telephonyRegistryManager"
am: 695838c4d9

Change-Id: Id0d3c5a586a1603d034b4301fa89620a7f6feb16