Merge "BT: Converging AVRCP files for multi-connection FR" into bt.lnx.5.0