[automerger skipped] Merge "Add setting for showing the vibrate icon in status...

[automerger skipped] Merge "Add setting for showing the vibrate icon in status bar" into sc-v2-dev am: 15a87a86 -s ours am: 3a46e06c -s ours

am skip reason: Merged-In I2d389d71dd9402353b058039464495a1d33ef0e9 with SHA-1 16148d2c is already in history

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

Change-Id: Ia3919d432c81dced9012c556b9c1dacd393725a2