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

Change-Id: Id77262dcf3f4fe46c8a080c7b5147161809c6332