[automerger skipped] A2DP offload: switch to new properties + swap audio XML files am: 150b9846f8  -s ours
am: 691dafdc43  -s ours

Change-Id: Id87f38c0bc205db327764f475e1ba5647cbba8b6