Merge "AvrcpController Test update" am: 66e6c23fcf am: 20cfe19ec8 am: bb2133504f

Change-Id: I44e8bcd03bc3f4c8e26556a2747f51936187514b