Merge "DO NOT MERGE [CTS] Add a test for key/value backup and restore." into nougat-mr1-cts-dev am: 030178caf6  -s ours
am: 806af7cddd

Change-Id: I046b141f76e6295ad7c72075946cd90455895ad4