Merge "Update IMMI#removeImeSurface() to take display ID" into main

...ndroid/server/inputmethod/InputMethodManagerInternal.java

...android/server/inputmethod/InputMethodManagerService.java

services/core/java/com/android/server/wm/DisplayContent.java

.../core/java/com/android/server/wm/InsetsControlTarget.java

services/core/java/com/android/server/wm/InsetsPolicy.java

...ore/java/com/android/server/wm/InsetsStateController.java

services/core/java/com/android/server/wm/WindowState.java

...ts/wmtests/src/com/android/server/wm/WindowTestsBase.java