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

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

Change-Id: I3a8de5dee8ea4fe9fec2e2234434743e7d96c169