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

Change-Id: Ic4c8baed1321c62cdebc2328b37838b37b145e37