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

Change-Id: Ifa4795f87e6de808cbbf4e238d8a0a938ad1f8b9