Merge "adb: win32: test USB kick on resume from sleep/hibernation" am: a23ba9f61a
am: c3f4997bfa

Change-Id: If75aceda20808f01c59eaf3323a8c267df4abc14