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

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

Change-Id: If4eaea18576b81c87c1d90cc70ae423a408365cd