[automerger skipped] Merge "AudioService: history of A2DP commands" am: 95a384daf7  -s ours
am: fe98e19565  -s ours

Change-Id: I0f27204c44026d0a4cd503a9f9cc9a76dbd5e680