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

Change-Id: Id741b77071408d49500d8e0860ae7beda18f062e