[automerger skipped] Merge "Add settings default handling for...

[automerger skipped] Merge "Add settings default handling for STATUS_BAR_SHOW_VIBRATE_ICON" into tm-qpr-dev am: 7d447f6e -s ours am: d2598313 -s ours

am skip reason: Merged-In Ibada490c823a47ef145d9b50cadd4838c687711e with SHA-1 8852a101 is already in history

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



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