Merge "Revert "Revert the default wall paper for framework / emulator b/27451024 Change-Id: I68ed094f44f1b4c48407497790f809147ec0ad5a"" into nyc-dev am: 137e30a
am: 4d0ed6a

* commit '4d0ed6a88845aec5442d5bd7963cfab67bb872ab':

Change-Id: I9a81fa498fa2b369f577b7e1b2dec3a3cedb20c0