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
am: 8c9390a0ee  -s ours

Change-Id: I72bbcc0493a7635a9c8e22516ff7c16677604c9f