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

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

Change-Id: I1914d2712aa5802ca212f05b41954a61b84c1256