Merge "Remove `start vold` action from post-fs-data"
am: fc920dcbb7

Change-Id: Icd9932470a0ae5a8ffda86463b05623f8374ea7d