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

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

Change-Id: I3dd84327f745f58647e71f5491b4240469a9dce9