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

Change-Id: I119a0c5cf44a9efaa0190c33a302730a4c756970