[conflict] Merge changes from topics "dialog-width", "icon-size" into udc-dev...

[conflict] Merge changes from topics "dialog-width", "icon-size" into udc-dev am: 6135a70b am: 83e9374c

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



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