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

Change-Id: I67f5eb8a7c1192449b11ffd7500222d6409d2f04