Merge "Remove "Always show icon when in vibrate mode"" into tm-qpr-dev am:...

Merge "Remove "Always show icon when in vibrate mode"" into tm-qpr-dev am: a82d5e7b am: 24dd061b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20297389



Change-Id: I929baecabdf7e3394289f4fb1046bb53bef7efb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>