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

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

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