Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE""
am: a10bd47d60

Change-Id: Ibad56dbe843c16863a70552ea27aa3e7ffca0787