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: Ib984a4bc34f0527c809de35919340019a04b017a