Merge "Merge "add vold to "shutdown critical"" am: da85cb71b3
am: 228b95fa15
am: 733fe09928" into oc-dr1-dev-plus-aosp
am: f39281b68c
Change-Id: I142be6c019cd9a3f8f212a2bbc97842cd04cf6eb
gugelfrei
commit
788d330274