Merge changes from topics "dialog-width", "icon-size" into udc-dev am: 6135a70b

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



Change-Id: Idb10652861e8ec2486b8aac5386b4364516ae8c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>