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

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