Merge "Maintain the users current value for STATUS_BAR_SHOW_VIBRATE_ICON" into tm-qpr-dev am: ff5346cd1a am: a290706617

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

Change-Id: I2a452f82bbbbf7516075364dd8bc892ba53ca302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>