[automerger skipped] Merge "[RadioInfo] Remove from Settings (into Telephony)"...
[automerger skipped] Merge "[RadioInfo] Remove from Settings (into Telephony)" am: 0aac2dfa am: cfb6e23b am: cc63645b -s ours
am skip reason: Change-Id Id62a2bf4b2c44efcd48319734d1cab6ed969ee06 with SHA-1 b7633cc5 is in history
Change-Id: Ia1290cbbeed356e9181fd8be8c02534be3bfe562