Merge "Allow vendor-init-actionable for wlan.driver.status and init.svc.surfaceflinger"