Merge "Add OnLive Universal Controller media buttons mapping." am: 30951b0666 am: 94fc36d8fc am: 3b458c921c

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

Change-Id: I264db17eaf594758ae997a18b5f27688d3458465