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