Merge "Match Nintento Pro Controller by name for interop am: 7839f002 am:...
Merge "Match Nintento Pro Controller by name for interop am: 7839f002 am: 725a50d3" into qt-r1-dev-plus-aosp
am: 50bbd4b8
Change-Id: Ib74ec864959a94aec78e31228e7814f2952bd206