[automerger skipped] Merge "Add field to set A2DP device volume on connect (1/2)" am: 1b9de57f38
am: fe96bd9c72  -s ours

Change-Id: Ife1a1762bba30d0a24919498c8b5c06b5639ac92