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

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

Change-Id: Id232a623d6aa3beaa3fdb5b31c722e96da6d75c9