Merge "Allow vendor-init-actionable for vold-related properties"
am: ee1b5a605e

Change-Id: I32bb609a127bd60a2e4a8b264a5895f706676743