[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 1d4856f3ae -s ours am: 5689a9f969 -s ours

am skip reason: Merged-In I00ac895f62785893b52660a7dafa1dad05a711f6 with SHA-1 11174ee27f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/20956546

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