[automerger skipped] Merge "RESTRICT AUTOMERGE CCodec: make config consistent before/after flush" into qt-qpr1-dev am: da52cc201e am: 3e7ef3c8b2 -s ours

am skip reason: subject contains skip directive

Change-Id: Id63d13353b94b6232bec93751b095072a9eb4368