Merge changes from topic "dialog-width" into sc-v2-dev am: a5088b13 am: 6d0441c6

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

Change-Id: I6629c4cf8091159b0526b1cb9b0f9e366a0898d0