Merge "Add nullability annotations to some InputDevice APIs"