[automerger skipped] [DO NOT MERGE] Full - Compatibilize winscope with master am: f230a13f30 am: c1ef16bdd7 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15405632 Change-Id: I7bd60c0c494906c0f888a34898290aef47f0ac16
This commit is contained in: