Merge "C2 VTS: Fix typo in picking up EOS param" into main am: e3c97d08 am:...

Merge "C2 VTS: Fix typo in picking up EOS param" into main am: e3c97d08 am: 2d568837 am: 073c8442 am: 33f374e9

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



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