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

Change-Id: Ieda56c13a9b2e3252c7679a1a026efec06a757e2