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

Change-Id: Ic0316d1a821a0e3c03e5784736e5a6e4266110d3