Merge "Avrcp log enhancement" am: 1b97dd0c84 am: 32dc73418c

Change-Id: I7fba33003a6d4eae8f4ec735e79381d1517d916a