Merge "Audioservice:do not supress music volume adjustment" am: 24f8ed2d98 am: 4c8aed88bc

Change-Id: I10e4e4aec1a868bb663933e4ab2c34f231efd525