Merge "Fix focus cleared and password keyboard shown during IME switching" into rvc-dev am: ec956ce538 am: bd20d9e535

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

Change-Id: I5ed60c03d3c8f1f7dca685fdea60a1d0266171f8