Merge "SurfaceFlinger: Only allow update of InputWindowInfo with permission."