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

[automerger skipped] Merge changes from topic "vibrate-setting" into sc-v2-dev-plus-aosp am: 4d85a47a -s ours am: 70d37ec5 -s ours

am skip reason: Merged-In I667b5c57ef646c57a2f6912df7d233b1b5c0f89d with SHA-1 225052be is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16928919

Change-Id: I8183b303a466b90b2dfbae727e4682f8aca7178c