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

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



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