Merge "Check ROTATE_SURFACE_FLINGER permission on arbitrary rotation"