[automerger skipped] Merge "[DO NOT MERGE] Update winscope proxy on R" am: afdc6bc134 am: 3cb8c57463 am: 9ef5036620 -s ours

am skip reason: subject contains skip directive

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

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