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

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

Change-Id: If8b3f6fd1c52f3ceca7a24b744ae13836c42fab5