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
am: 5e93a23108 -s ours
Change-Id: I396de4a6a6b4605d2dadde5116953dcb8dc64a2f
This commit is contained in: