[automerger skipped] Merge "Fix showing keyboard without editor focused in...

[automerger skipped] Merge "Fix showing keyboard without editor focused in some cases (1/2)" into rvc-qpr-dev am: 12b80770 am: a68d3b27 -s ours

am skip reason: Change-Id I37ae6e30d1de581ba15131c2a90396b3a522a4d6 with SHA-1 1ef07dff is in history

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

Change-Id: I00c5422119e0fd9d541a248c0b9d94dc4d10ffec