Merge "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: 608a3b8f82  -s ours am: 8884bfc2ac  -s ours" into nyc-mr2-dev-plus-aosp
am: c95fb00d30  -s ours

Change-Id: Ifd4c31704739b669fee3ce3eaf5acbcf5b0730d4
tree: 4c279293784500dbf16b3f954126730ce344b235
  1. tests/