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

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

Change-Id: I246550a5b6ae172bde860630de702a68e5cf3645