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

Change-Id: I9297617be01e47226eb00f59433a14524b14235d