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

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

Change-Id: I78d0dded98f00114e90fb5b8fe6b054becccba95