Merge "Ensure screenshot input monitor is always removed" into sc-v2-dev am: 8a9fb9c2

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

Change-Id: I5ee59b6958f24cb55a7d0a94fb7410b87f0b4b6d