Merge "APV: Fix color conversion functions" into main am: c1c8bd5b

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3439008



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