[automerger skipped] Merge "Make SysUI dialogs more consistent" into sc-v2-dev...

[automerger skipped] Merge "Make SysUI dialogs more consistent" into sc-v2-dev am: ef54ed96 am: 17fbd936 -s ours

am skip reason: Merged-In I587d9537309357555229db411edfb154151a92e7 with SHA-1 95e3bd1d is already in history

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

Change-Id: Ic3e9fb6e2fc7f3209dee031c249db16a36454dee