Merge "Wallpaper backup/restore is now in its own package" into nyc-dev
am: 8e9431e

* commit '8e9431e54f23c089b3e664a82c622783ef13796c':
  Wallpaper backup/restore is now in its own package

Change-Id: I3501a452d26316da8787a4695fe2ea46ba85518c