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

Change-Id: I44cf25bb501aa5ce777b0984bba03e197dd5df8c