[automerger skipped] DO NOT MERGE - Merge Android 13 am: 294b4e85 -s ours...

[automerger skipped] DO NOT MERGE - Merge Android 13 am: 294b4e85 -s ours am: 3e21edd6 -s ours am: 36eaf8b4 -s ours

am skip reason: Merged-In Ia1d57375170cd8b0c33f3685b2dc3ef0c52ab117 with SHA-1 e1eec119 is already in history

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



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