Merge changes from topic "vibrate-setting" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Add setting for showing the vibrate icon in status bar 2p: 16148d2c8c
  Add setting for showing the vibrate icon in status bar