Merge "Use dm.CreateDevice() with a timeout." am: e9023dc7bb am: 7da18c97ef

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

Change-Id: If3c48689e76062c7819bba9a8ac43c2e14e4d189