[automerger skipped] Merge "Ensure screenshot input monitor is always removed"...

[automerger skipped] Merge "Ensure screenshot input monitor is always removed" into sc-v2-dev am: 8a9fb9c2 am: b84d5631 -s ours

am skip reason: Merged-In I0aff68ce4876082a5e20e3fe5f83cffcda4f6390 with SHA-1 02de5054 is already in history

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

Change-Id: I977c72c0faa736c24b7d6c577d9b803b07c2fa70