Merge "Merge "add vold to "shutdown critical"" am: da85cb71b3
am: 228b95fa15
am: 733fe09928" into oc-dr1-dev-plus-aosp
commit
f39281b68c