Merge "AVRCP: set addressed player on key dispatch" am: ec6957edd2
am: 68591cf8ba

Change-Id: I4277b4726fef648547cc97a7c696030ea05cd23d