Merge changes from topic "dialog-width" into sc-v2-dev am: a5088b1302

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

Change-Id: I5afabf98014ecc6289036e6a999fb39806b5f32a