Merge "AVRCP: workaround invalid setBrowsedPlayer id"