Merge "Use ringer assets for notification volume since the two volumes are tied." into ics-mr0