[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 8f21d7cc57 -s ours

am skip reason: Merged-In Ic2c1f4551c86f43a91dfa0bf6546eea8049eb957 with SHA-1 b27845dbf5 is already in history

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

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