Merge "Remove WAKEUP_SURFACE_FLINGER permission as SystemAPI"