Merge "Restrict telephony.cts.CellInfoTest to Devices with FEATURE_TELEPHONY" into marshmallow-cts-dev
am: e98f4d9913

* commit 'e98f4d9913f623bd10f396d5455da1e2d06e0ffb':
  Restrict telephony.cts.CellInfoTest to Devices with FEATURE_TELEPHONY