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

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

Change-Id: I6fd775d8e72df79c77dba91e9e4b68c8a000d881