Merge "Bluetooth: Test Changes for AVRCP Controller"