Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev am: c65a010a39  -s ours
am: 6ebc52a950  -s ours

Change-Id: I1ae4fb72bc6a5576dfb3894f8b24e529cd52e0a6