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

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



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