Merge "Explicitly restart the killed wallpaper service" am: 0780b18a9f
am: 9298af376a

Change-Id: If3cd3217c2d9f42772e0f276c1bc3c1380ac149f