[automerger skipped] Merge "Allow vendor-init-actionable for wlan.driver.status and init.svc.surfaceflinger" into pi-dev
am: a4217d03a7  -s ours

Change-Id: Id178a35bd91bbc6981e0b06de6fc0cb022d8681a