Merge "Support multiple devices in winscope proxy" into tm-dev am: 9ac33a4a0e

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

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