[automerger skipped] Merge UP1A.230905.019 am: 88ba5e0050 -s ours

am skip reason: Merged-In Iadbdec303acd4fcb5e244ffa2292cc4c9112253d with SHA-1 64d53e549c is already in history

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

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