[automerger skipped] Merge "Schematize vold system properties" am: 095d0f640e am: 73694f8faa
am: 1a7cad6b1a  -s ours

Change-Id: Ib34c93da4ed36fec25bf5c97fee022db6068d7a1