Merge "Add timeout for mount on untrusted media" into main am: a8ce13c9b3 am: 7c13229c4e

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

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