Merge "libdm: add an overload of DeleteDevice accepting a timeout_ms" am: dde59c32ac am: 4c68fef444
am: 1262a276e5

Change-Id: I4da2702078315d98432f3b7f0d9acee9d315f746