Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev