[automerger skipped] Merge "Prevents scroll capture from targetting secure...

[automerger skipped] Merge "Prevents scroll capture from targetting secure windows" into sc-dev am: 7ee0307a am: fe8265d5 -s ours am: f1f4971f -s ours

am skip reason: Merged-In I436ff109ae26ff22f5d4367a82f0d391588d0a0f with SHA-1 8328fde0 is already in history

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

Change-Id: Idc78234b49dbabacf1b6f301a050ce2c21d8b01b