[automerger skipped] Merge "[DO NOT MERGE] DisplayImeController: fix...

[automerger skipped] Merge "[DO NOT MERGE] DisplayImeController: fix out-of-sync IME visibility" into rvc-qpr-dev am: 97bd8baa am: 5731fc73 -s ours am: a3a5ccc8 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b88d2afb0b2070a71359753a586bf482758b14e