Merge "Fix IME flicker: move hiding the surface into the control target" into rvc-dev am: 895a2e626a

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

Change-Id: I2d7c590f30beb36c397231d55cd98fabee4f3597