Merge "Revert "Use the global default cpp_std."" into main am: 8ba2c5c02c am: 252e1cac93

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

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