Merge "Merge "Workaround for screenshot IME focusability" into rvc-dev am:...

Merge "Merge "Workaround for screenshot IME focusability" into rvc-dev am: 68823dfb am: b0303c6e" into rvc-d1-dev-plus-aosp am: 14f5f705

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

Change-Id: I7216c4f66a08bd397b07e6f9a3991409c78b1915