Merge "C2Config: correct declaration of tunnel-peek mode" am: d46cddfe4c am: 7a5305783b am: f3fb221720

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

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