[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 0abc12eff9 -s ours

am skip reason: Merged-In Ia8a0e9fe0ef6c57a772979e5cd5ee4eef8b86322 with SHA-1 3dbbea0278 is already in history

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

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