[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: 32a90ea6 -s ours

am skip reason: Merged-In I2a2e6bbbcd00f4d64c3226f3b22a9880acc3c412 with SHA-1 a8cf862d is already in history

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

Change-Id: I6c50a2582258b8ec0d80077d5cb5742eaeeb5cf6