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

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

Change-Id: I5c63dfad6008a066c3fb222f5eb3c19fd32f962c