Merge "Exposes KeyEvent.getDisplayId() as @TestApi." into udc-dev