[automerger skipped] Merge "Add support for Scuf Vantage game controller." am:...

[automerger skipped] Merge "Add support for Scuf Vantage game controller." am: 8ee49446 am: 8114f360 am: 889b8dea am: eac0d110 am: 696d25e4 -s ours

am skip reason: Change-Id I21d23dcbeb4ef24d212d4e386f6dbf8b1b89d9f6 with SHA-1 2ec60509 is in history

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

Change-Id: I9913645aad5f841d41edb14ce41b245d03dc423f