Fix wallpaper restore from pre-N devices am: ebadfb17e7
am: ac2f0b2c51

Change-Id: I7b8c8eb3e880389d1f70fd15f9d82bd815f1be16