Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev
am: 43a0aa48b0  -s ours

Change-Id: I7c31558b0102a8464d15121c21402f0de77c8b12