[automerger skipped] Merge "new telephonyRegistryManager" am: 695838c4 am: 5048686f
am: d41bf48d -s ours
am skip reason: change_id I6c1680b351effd18fb1e6b9ac9272e32282c495d with SHA1 ef9a899c is in history
Change-Id: I8df7a0fd8c683d1066c30cf32317877a69b7a0cb