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

Change-Id: I4e4ed0215ad07f49101119c0f262d0dc5acbab8d