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

Change-Id: I6f9d38268320095ba69bfa490fcdf4dadd173fe8