Merge "Remove coldboot from vold"
am: cc29c526d4

Change-Id: I3de54db5f27692ab47ddf047ede056c536424438