Merge "[automerger skipped] Merge "new TelephonyRegistryManager" am: 7a79194fcb am: 44d0c2a7dc am: 626f4cdb81 -s ours am skip reason: change_id I1b750751148925b4a7bd94553318907654012fc1 with SHA1 288b71c8c1 is in history"