Merge "audioservice: fix media volume reset at boot" into oc-dr1-dev am: 09a93b9739
am: 5dbd36d6c2

Change-Id: Id3cffa56e203092a720f2ec34a6304880b83020a