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

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

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