Merge "Add KEYCODE_MEDIA_AUDIO_TRACK mapping to USB HID Usage consumer page (0x0c/0x173) "Alternate Audio Increment"" am: 21e6488ae7 am: ecd346e431 am: 6b96fe8128 am: 67236850f5

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

Change-Id: Ia52fbe23826565f4fa785a1b52a4d1196a516b6f