[automerger skipped] Merge "audioservice: fix persistency for volume per...

[automerger skipped] Merge "audioservice: fix persistency for volume per attributes" am: 2b6df364 am: 6875f1b5 am: 7c07e8b5 -s ours
am skip reason: skipped by user elaurent

Change-Id: Idd51c896499ff4db4df272adb93ef89db4c99bc5