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

Change-Id: Ib3f07fd3a91aaabecbce24c68c50d0b13a210c5e