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

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

Change-Id: Iadc3dda0b86f1466d977b290e14f1cf120dfc206