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

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



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