Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black" am: 57edeef91a  -s ours
am: 4fa95e7bbb  -s ours

Change-Id: If522327abdedb779d2a60be7dafa08701bfde0ac