Merge "Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0  -s ours" into nougat-mr1-cts-dev am: 137a9169cf  -s ours am: bb6a9be084 am: 89195184af am: 0a0b1d2fe6  -s ours am: 8903a0aa04" into oc-dev-plus-aosp
tree: 4c279293784500dbf16b3f954126730ce344b235
  1. tests/