Consolidate the wait in recovery's reboot am: e8ca1b8634

Change-Id: I27c1594c56f7452e2d1c42a1cb88a9caa85e8798