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

[automerger skipped] Merge "Sysui changes to support vibrate icon setting" into sc-v2-dev am: 28fccbd8 -s ours am: 2a9c927b -s ours am: de8e01eb -s ours

am skip reason: Merged-In I667b5c57ef646c57a2f6912df7d233b1b5c0f89d with SHA-1 5b5a16e9 is already in history

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

Change-Id: I0d4d293b73d015ca91fcf2b9f1c2d2c03b5b0401