[automerger skipped] Merge "DO NOT MERGE Revert "Fix showing keyboard without...

[automerger skipped] Merge "DO NOT MERGE Revert "Fix showing keyboard without editor focused in some case..."" into rvc-qpr-dev am: 1c62ec88 am: 63054c7f -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ifa72a22da18b4e2fb4ba016ddd256c09905a73dc