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

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

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