[automerger skipped] [automerge] Sysui changes to support vibrate icon setting...

[automerger skipped] [automerge] Sysui changes to support vibrate icon setting 2p: 5b5a16e9 am: ce1224ae -s ours am: aaedfb6f -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: I53068317b78bb7684858c57b19c803ad7b5d8c09