Merge "[DO NOT MERGE] Update winscope proxy on R" am: afdc6bc134

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

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