[automerger skipped] Merge Android 13 QPR3 am: 2c7e8787 -s ours am:...

[automerger skipped] Merge Android 13 QPR3 am: 2c7e8787 -s ours am: f9fa1119 -s ours am: b9983b70 -s ours am: 4c5a72f4 -s ours am: 03868284 -s ours

am skip reason: Merged-In Idbb8b1d3e453c937f118dc74a0db153f867dd506 with SHA-1 b21dba71 is already in history

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



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