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

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

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