Merge \"Fix wallpaper restore from pre-N devices\" into nyc-mr1-dev
am: 9fd44ef954

Change-Id: I8c8bb6815299b41438f4919248a5b9b1e2b2dca2