Merge "Revert "Updated volume rocker assets for ring notification icon"" into ics-mr0