Merge "Fix showing keyboard without editor focused in some cases (1/2)" into...

Merge "Fix showing keyboard without editor focused in some cases (1/2)" into rvc-qpr-dev am: 12b80770

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

Change-Id: I4e6f2e295e19b3a5b7812c14d008119c08902ec3