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

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

Change-Id: Ib727f09a3426172ac789f0a2e5bab06491e7b002