Merge "VolumeShaper: improve logging and dumpsys" into oc-dev
am: 9706527f86

Change-Id: If416846deaba6ce56a814271d6f0002fa36ae539