Merge "SF: add WAKEUP_SURFACE_FLINGER permission"