Merge "Use sleep_for for fsck timeout" am: 0777c5d6 am: 93c9dbe1

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



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