[automerger skipped] Merge Android 13 QPR2 am: 301de5b4 -s ours am: 0bb4ab98 -s ours

am skip reason: Merged-In I1c7337beb907f1a1d3d527ee3e7c4633ee54e4f2 with SHA-1 b16ecd1d is already in history

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



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