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

Change-Id: I7759fc380ef9555cb58f9ab593248e69cd798c70