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

Change-Id: I2e54a301473c155e18fa52f90dc318e81d2ea996