Merge "[automerger skipped] Merge "C2SoftAVCEnc: Change default dimensions and...

Merge "[automerger skipped] Merge "C2SoftAVCEnc: Change default dimensions and frame rate" into rvc-dev am: a6127a93 am: c77c5395 -s ours" into rvc-d1-dev-plus-aosp am: df49b35c -s ours am: 46735142 -s ours

am skip reason: Change-Id Ic86e5d728d99652ea4e4a46df4f46b3ff3b357ac with SHA-1 7cff1b73 is in history

Change-Id: I4807e3f48053a76fa6f5367a622085543086f408