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

* commit 'ca95a78c7a583835d11cb73f3bd7ae9c7c61008b':

Change-Id: If8dc482f9807ee45101be77d0395d05a8787b9fa