Merge "Fix themed icon preview reload (2/3)" into udc-dev am: 3d0a6e1b am: a9d6470c

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



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