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

[automerger skipped] DO NOT MERGE Revert "Fix showing keyboard without editor focused in some case..." am: 12ed7d3e am: e93e41c4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If93a55e1427d5fe6eedb68afea4de3b734b5d1a9