[automerger skipped] Merge "Add support for video peek in Codec2" am:...

[automerger skipped] Merge "Add support for video peek in Codec2" am: d6469a81 am: 1f83cdbe -s ours am: 88c3141c -s ours

am skip reason: Merged-In I74f0b6de2161f563a80b33f1bb3d6ff961de09b6 with SHA-1 5ffbcb30 is already in history

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

Change-Id: I6ee762e9c57032674d92a73f9d63c4466498e8e0