Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am: f8a4dc4a6f
am: dc9f8fab0f

* commit 'dc9f8fab0fd9485b22651fe5c7f70961d67d697a':
  Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()