[automerger skipped] Merge "Allow vendor-init-actionable for vold-related properties" am: ee1b5a605e
am: 9b9c5e45fa  -s ours

Change-Id: I4f2ec48d0287299be7a9009bfa24b5d3e094e68d