Merge "Add the FEATURE_TELEPHONY restriction to...
Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am: f8a4dc4a
am: dc9f8fab
* commit 'dc9f8fab':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()