Merge "VolumeShaper: API change for duration" into oc-dev
am: 44515357ce

Change-Id: I9bbf338a3c3170bd2304637a197c643c8da0a00f