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

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

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