Merge "Revert "SF: Updating permissions checking in Surface Flinger.""