Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours" am: 67a8712d22 -s ours am: e9122b9946 -s ours
am: 368d667a4b -s ours
Change-Id: I71cc8a02fe24e2d6c0563b17b8b853381b39880c
This commit is contained in: