Merge "libdm: add an overload of DeleteDevice accepting a timeout_ms"
am: dde59c32ac

Change-Id: I8bc733abd74b7587cfcddbac8e20156b41822b99