[conflict] 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


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