Merge "Make SysUI dialogs more consistent" into sc-v2-dev am: ef54ed965f

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

Change-Id: I881d9f72b4cc79b90e8265655d9e40596995e718