[automerger skipped] Merge "Expose all TelephonyRegistryManager methods" am:...
[automerger skipped] Merge "Expose all TelephonyRegistryManager methods" am: 66fc127a am: b2eae3c4 -s ours am: 141380eb -s ours
am skip reason: Change-Id I43537bf741742eb9e8df1a55e20cc3c8b2bbd874 with SHA-1 9b94e1fc is in history
Change-Id: I72c864e83ad646b9c8352df39b8262a8ecba28e2