[automerger skipped] Merge changes from topic "vibrate-setting" into...

[automerger skipped] Merge changes from topic "vibrate-setting" into sc-v2-dev-plus-aosp am: 39c4d8b8 -s ours am: 9aba5cfe -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: Ic32e90e39b2c783ea3d89b47e6358209c360a149