Consolidate the wait in recovery's reboot am: e8ca1b8634

Change-Id: Ia58c1b49be98c7f1026e0b76ccd9a26d227a7816