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

Change-Id: Ie03f8dd36d77ebb3545276dbf98a3e81c4b00bbe