Add 5s timeout to cleanup commands am: 3a18895c6f am: 9816401d02

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1674626

Change-Id: Ic84196b48b159c9a2a902cd1295ceea2483c49e7