am aad62128: am 51b4a40e: Merge "Expose vendor and product IDs for InputDevices" into klp-dev

* commit 'aad62128100f0c1562f9c61a721b703480ed3772':