Merge "Merge "Add KEYCODE_MEDIA_AUDIO_TRACK mapping to USB HID Usage consumer...

Merge "Merge "Add KEYCODE_MEDIA_AUDIO_TRACK mapping to USB HID Usage consumer page (0x0c/0x173) "Alternate Audio Increment"" am: 21e6488a am: ecd346e4 am: 6b96fe81 am: 67236850" into rvc-qpr-dev-plus-aosp am: 34c6c661

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

Change-Id: I40b85269a1f0c9ae065b12a7842d3be1e7c9b0f4