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

Change-Id: I03d3018bd416cd3dbac237768b1f441223e39238