Merge "Remember all wallpapers' backup-allow state" into nyc-mr1-dev
am: 6ae8693cd7

Change-Id: Iade90bf272d1b05c18b79c679c53ada2a8782742