Merge "Merge "Separate mute and vibrate icons in status bar" into sc-dev am: 8e741727 am: 1903b372" into sc-v2-dev-plus-aosp am: 77c41ba5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15265319

Change-Id: Id8358a0618032f2a868a730da0bf52265286a69c