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

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

Change-Id: I760c959c891a12b5ea096ed9f8de56209ec45233