Merge "Make InputDevice getAssociatedDisplayId part of the test API" into main