[automerger skipped] Merge changes from topics "dialog-width", "icon-size"...

[automerger skipped] Merge changes from topics "dialog-width", "icon-size" into udc-dev am: 6135a70b am: a8ee6a64 -s ours

am skip reason: skipped by user shreshtabm

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



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