[automerger skipped] Merge "Use correct window token for scrolling...

[automerger skipped] Merge "Use correct window token for scrolling screenshots" into sc-dev am: d23e0827 am: 1c32c8c8 -s ours

am skip reason: Change-Id I2a2e6bbbcd00f4d64c3226f3b22a9880acc3c412 with SHA-1 3a4750be is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I529a86fa51fd7a6108c41f0ee3936a731287fba3