Merge "MetadataCrypt: fix timeout due to missing userdata dm device" am: df2bc1025b am: 1b2cac19c8

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

Change-Id: I4483bf1f085da11bd8220eee51805a37a911f079