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

Change-Id: I0614c8baf7c8be4aced61b099938c1b517bb0ad6