Merge "Use a strongly typed LogicalDisplayId for displayId(1/n)" into main

core/jni/android_hardware_display_DisplayViewport.cpp

core/jni/android_hardware_input_InputWindowHandle.cpp

core/jni/android_view_KeyEvent.cpp

core/jni/android_view_MotionEvent.cpp

core/jni/android_window_WindowInfosListener.cpp

core/jni/platform/host/HostRuntime.cpp

libs/input/MouseCursorController.cpp

libs/input/MouseCursorController.h

libs/input/PointerController.cpp

libs/input/PointerController.h

libs/input/PointerControllerContext.cpp

libs/input/PointerControllerContext.h

libs/input/SpriteController.cpp

libs/input/SpriteController.h

libs/input/TouchSpotController.cpp

libs/input/TouchSpotController.h

libs/input/tests/PointerController_test.cpp

libs/input/tests/mocks/MockSprite.h

libs/input/tests/mocks/MockSpriteController.h

...core/jni/com_android_server_input_InputManagerService.cpp