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