Merge "RESTRICT AUTOMERGE Reland "Fix showing keyboard without editor focused.."" into rvc-qpr-dev am: a308227709

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

Change-Id: Ie47027b11241ba99cb13ec2b0f0d823c3504d096