Merge "Allow vendor-init-actionable for wlan.driver.status and init.svc.surfaceflinger"
am: 5e5509e8fc

Change-Id: I8d74085efee03b2dfb94a9566496842a9e774ce4