Merge "Wallpaper Quick Switcher Reload (2/3)" into tm-qpr-dev am: b70f0f91 am: b9f23297

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



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