Merge "add vold to "shutdown critical"" am: da85cb71b3
am: 228b95fa15

Change-Id: I0de967657d969f54dedddbb2b72ab07ed650e2e3