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