Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 819ac6e8f9 am: 94e885f8d9

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

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