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