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

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