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