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

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

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