Merge "VolumeShaper: update API, use "Millis" instead of "Ms"" into oc-dev
am: 170e3e242b

Change-Id: Ie4784a0933e5113b8069da09683a13f4166bc87e