[automerger skipped] Merge "Add setting for showing the vibrate icon in status bar" into sc-v2-dev am: 15a87a86bb
-s ours am: 3a46e06c41
-s ours am: 90aabce9b4
-s ours
am skip reason: Merged-In I2d389d71dd9402353b058039464495a1d33ef0e9 with SHA-1 16148d2c8c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932463
Change-Id: I71ea3d4fd2de9387ef3a5b5d7971a7d44c2fe430
This commit is contained in: