[automerger skipped] Merge "Hide TelephonyRegistryManager." am: 3300730d3d am: c7243a6ded -s ours am: 25aa9a9d65 -s ours
am skip reason: Change-Id I2b47ab45839f07494dcad4f1878809a55ddd3087 with SHA-1 7411d22e57 is in history
Change-Id: I38808de20c5e86dd1c31e87591aa418294df5266
This commit is contained in: