[automerger skipped] Merge Android 13 QPR3...

[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 0ea34207 -s ours

am skip reason: Merged-In Idf6dc5a825f7541912a7bb891ce8f2b5b52aea9f with SHA-1 6a76e49e is already in history

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



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