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

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

Change-Id: Ic9d35ad3375c5a8b80be355a71b9ebc2f6edc8c5