Merge "C2Config: correct declaration of tunnel-peek mode" am: d46cddfe am:...

Merge "C2Config: correct declaration of tunnel-peek mode" am: d46cddfe am: 7a530578 am: f3fb2217 am: daf9c7e9 am: 86b3b569

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



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