Merge "Merge "Fix IME flicker: move hiding the surface into the control...

Merge "Merge "Fix IME flicker: move hiding the surface into the control target" into rvc-dev am: 895a2e62 am: 2f075696 am: fd3f3b95" into rvc-qpr-dev-plus-aosp am: 2ddd9e6e

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

Change-Id: I208f4db58f89ae1abf96f9c0b88d3b8e4c086476