Merge change 22545 into eclair

* changes:
  Use correct UUID to authorize AVRCP