Merge "[RadioInfo] Remove from Settings (into Telephony)"
am: 0aac2dfab6

Change-Id: I20d26fa821333648ce14bccac72f288fb6b9a99e