Merge "DO NOT MERGE [CTS] Fix tests for devices that don't support backup feature" into nougat-mr1-cts-dev
am: 14cf2c8fd0  -s ours

Change-Id: I570cd7396e3968f08dc2871f3878230009f3536c