Merge "Fix some dimens in dialog" into sc-qpr1-dev am: 38c00180 am: d83a3bc4

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

Change-Id: Ia6b5d7e2ca84f578d43e7266829c1b3cba34e94f