Merge "AvrcpController Test update" am: 66e6c23fcf

Change-Id: Iae97e1ea0c482bbae3dd9bba8f38eadafbc5fe0f