Merge "Separate mute and vibrate icons in status bar" into sc-dev am: 8e741727 am: fd807ee5

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

Change-Id: Id7319356ba5396e0bfdd38277a9157b1ead9a3c8