Merge "Keep wallpaper quick switch order stable (2/3)." into tm-qpr-dev am: a2822deab4

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

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