Merge "services/mgmt/device/impl/...: Make testDeviceManager notice an exiting test device manager quickly, rather than by waiting for timeouts to expire. This allows us to re-enable the version update test in TestDeviceManagerUpdateAndRevert as the version mismatch failure is now noticed quickly"