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

Merge "Merge "Workaround for screenshot IME focusability" into rvc-dev am: 68823dfb am: 8ba465ac am: c7b1e2d6" into rvc-qpr-dev-plus-aosp am: f42e4749

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

Change-Id: I8c09a6dc943fc7ed6d731e2c6df9c42c3df6109d