Merge "Merge "Define equals and hashCode for InputDeviceIdentifier." into nyc-dev am: c81b726 am: 80b6288" into nyc-mr1-dev-plus-aosp