Merge "Merge "Add the Moves setting values to the backup list." into...
Merge "Merge "Add the Moves setting values to the backup list." into nyc-dr1-dev am: 05c91244 am: c5ce3a38 am: 6f11d378" into nyc-mr1-dev-plus-aosp
am: f9e29646
Change-Id: I636f56d43d67abbaff321244a4dc4a720cfee9d5