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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403074

Change-Id: If1bc500776c7a411de294e66d220cf29a6302d91