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