Merge "new TelephonyRegistryManager" am: 7a79194fcb
am: 44d0c2a7dc

Change-Id: I2a8f753c2c9fbceb4a3cde9b31fdb3d7d82ea028