Merge "DO NOT MERGE Revert "Fix showing keyboard without editor focused in some case..."" into rvc-qpr-dev am: 1c62ec882f

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

Change-Id: Idde409bd24195ea9c555408d1df5ea1c59de7ec0