Merge "Merge "codec2 (mainline): pin cpp_std to gnu++17" into main am:...

Merge "Merge "codec2 (mainline): pin cpp_std to gnu++17" into main am: 21d78404 am: 60b46156" into udc-qpr-dev-plus-aosp am: da9a1001

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



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