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

Change-Id: Iea61d09146ba34caf1a10eb371e416c54462c59b