Merge "Skip data saver related tests if the device doesn't support it." into oc-dev
am: a61bc6a566

Change-Id: Idbee1ba7843242a5cac46e8a62c642c2f8b37fd3