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

Change-Id: I39efaeb589830e7d448e208d37a079c798477224