[automerger skipped] Merge "Add OnLive Universal Controller media buttons...

[automerger skipped] Merge "Add OnLive Universal Controller media buttons mapping." am: 30951b06 am: 94fc36d8 am: 3b458c92 am: 47f5d7de -s ours

am skip reason: Change-Id Ie69b3f7f8f13c778208454fb789113126c04966a with SHA-1 6bb9e301 is in history

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

Change-Id: I2f7d37ab7ab05b318005e6a4982bd47f74feb5e8