Merge "Update winscope proxy to version 1.0" am: 20b563e65e am: 1130743c2c

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

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