Merge "Revert "Add permission check for blurs in SurfaceFlinger"" into sc-dev