Merge "Remove coldboot from vold" am: cc29c526d4 am: 9a2e29fe32
am: 78bf4cbb12

Change-Id: Idbeaf5ef67d59318507a83ad988a6dff45356b2b