Merge "Fix IME flicker: move hiding the surface into the control target" into rvc-dev am: 895a2e626a am: 2f07569650 am: 2b8b39ec24 am: 679ed2e0cc

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

Change-Id: Idfed2355c5072990709623fcacd96e5a2d56c001