Merge "add vold to "shutdown critical"" am: da85cb71b3 am: 228b95fa15 am: 733fe09928
am: 9045c86a32

Change-Id: I5440cec7c057e5bc5e40886fcedd1a4814fd063a