[automerger skipped] [automerge] Add setting for showing the vibrate icon in...

[automerger skipped] [automerge] Add setting for showing the vibrate icon in status bar 2p: 16148d2c am: 0b843be4 -s ours am: cf59b353 -s ours

am skip reason: Merged-In I2d389d71dd9402353b058039464495a1d33ef0e9 with SHA-1 4871b2cf is already in history

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

Change-Id: Ie434892c7c53b8fc74fbe5b4971bf5c3d1431ee9