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

Change-Id: I5d51636329b4590c846c99486033ec4e423416ec