[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 am: c0651787

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



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