Merge "AvrcpController Test update"