[automerger skipped] Merge "Prevents scroll capture from targetting secure windows" into sc-dev am: 7ee0307aed am: ae775a4583 -s ours
am skip reason: Merged-In I436ff109ae26ff22f5d4367a82f0d391588d0a0f with SHA-1 f1bc1631cc is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15374948
Change-Id: I623988a3e5a50dd9330d0c656282dcc5d028d041
This commit is contained in: