[automerger skipped] Merge "C2SoftAVCEnc: Change default dimensions and frame rate" into rvc-dev am: a6127a9356 -s ours

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

Change-Id: Ib6cf91de254213e523b129937d050824aa0ab1ea