[DO NOT MERGE] Full - Compatibilize winscope with master am: f230a13f30

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

Change-Id: Ibcb4d582e1becc78a228b934f0f2591c97b3ddf4