Merge "Use sleep_for for fsck timeout" am: 0777c5d604

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2311079

Change-Id: I007ddd743a88a629fac27f6bf8575957661de955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>