[automerger skipped] Merge "Add support for Razer Kishi game controller." am: dab3aaa5c6 am: d13c410dfa am: b2ccd88b3f am: 85ec9950e2 am: abc8502551 -s ours

am skip reason: Change-Id I6f94e212fe10f777f04ad9815468e2148d4252f5 with SHA-1 5230993c35 is in history

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

Change-Id: I15900eeef6900b09aac229e3872904caceb7760c