[automerger skipped] Merge "[DO NOT MERGE] Full - Compatibilize winscope with...

[automerger skipped] Merge "[DO NOT MERGE] Full - Compatibilize winscope with master" into sc-v2-dev am: 0b7f506a am: 71cb3afb -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ibc7026cd12dd3a842148a6dfe53eb7ced75952cc