Merge "Revert "APV: Pass Color aspect params to core encoder correctly"" into...

Merge "Revert "APV: Pass Color aspect params to core encoder correctly"" into main am: b223c2c0 am: e3b07138

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



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