Merge "Properly configure live wallpaper selection following restore" into nyc-dr1-dev am: 9141666630 am: 9ff115c3c5 am: 5065068d3f
am: b4d5abcf22
Change-Id: I37bb6d1e3f51409a0a2d546dcc6bad1281311dab
This commit is contained in: