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

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

Change-Id: Ia418515b0c1f4b270cf07885f9c089d8ab146df8