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

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



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