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

Change-Id: Ie887ad519c503e03ecbef10f232edbc882abc068