Merge "Merge "Close screenshot UI on CLOSE_SYSTEM_DIALOGS intent" into rvc-dev...

Merge "Merge "Close screenshot UI on CLOSE_SYSTEM_DIALOGS intent" into rvc-dev am: 703aaba6 am: 8d692863" into rvc-d1-dev-plus-aosp am: 6aeba0e4 am: c142cd87

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

Change-Id: Id487bf1f409e98824921f90614d9ad96f6f3b86b