Merge "IME Support for SurfaceControlViewHost" into tm-dev am: 045bc655a3 am: 469c8a3d76

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

Change-Id: Ia33ff518ee6e46b091789725ccde38025d3c0cae