Merge "Beautifies picker disabled dialogs (2/2)." into tm-qpr-dev am: c9c8e5602c am: 7379a31f5e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/20816922

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