am b42baaa8: am 978cfc39: Merge "SystemUI needs the SET_WALLPAPER permission"

* commit 'b42baaa829be7efa692088e97a44712daecbf5f4':
  SystemUI needs the SET_WALLPAPER permission