[automerger skipped] Merge "new telephonyRegistryManager" am: 7ec30b0e am: 21eaad2b
am: 0a97b49d -s ours
am skip reason: change_id I26abcc69b8459e8c6634a9c15865874f803b7259 with SHA1 02b77dce is in history
Change-Id: I5db6e760b50acba04d1719dedf10d8b308d9388d