Merge "codec2: Fix ambiguity in operator overloads" into main am: 197ad625 am: effa7f82

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



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