Merge "Merge "Separate mute and vibrate icons in status bar" into sc-dev am: 8e741727cc am: 1903b37202" into sc-v2-dev-plus-aosp