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: 4ecf9aadc5 am: 24df7fc52b
am: 5b87fbabc3

Change-Id: I283e9c5b9b59f4e59da918dd5d0c4bd57ccc265a