Merge "Add timeout for fsck on untrusted media" am: 313e8556a6

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

Change-Id: I9786e6da7d4f3926c7a9f329db73eacec48645d5