Merge "audio policy: fix media volume after ringtone" into nyc-mr1-dev am: 429a052c35 am: dd96219d15
am: a5a70db55f

Change-Id: I3b7f058287f8c8e0b710b7474e68769dfd96d763