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

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

Change-Id: I2f5462c5590d26c43135537f083d3af9e54fe307