Merge "Add support for Razer Kishi game controller." am: dab3aaa5c6 am: d13c410dfa

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384139

Change-Id: I5e5ce4f05763347ebe7e1cd5dd80be82489d436c