Merge "DO NOT MERGE [CTS] Fix tests for devices that don't support backup feature" into nougat-cts-dev am: 80bda25dfd  -s ours am: 13505a1b45 am: 32fa1ba9a4 am: b50b226d69 am: bf34e3a9f1
am: a09622165d  -s ours

Change-Id: I82522b46df32c2d875c736601c444152a0cbeccc