Merge "Grant SET_WALLPAPER_DIM_AMOUNT permission to shell"