Merge "Fix adb proxy get device id on windows" am: 120f46ef53

Original change: https://android-review.googlesource.com/c/platform/development/+/2098153

Change-Id: I0af71f0dbb26c1dfd0b52aadf6c68ec20bca6c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>