[automerger skipped] Merge "C2SoftAvcDec: Fix interlaced input handling" into rvc-dev am: ac156ba5 -s ours
am skip reason: Change-Id I1f6a12878eeebb604a16f8e9edcdf3d631ef5afc with SHA-1 a17cf65e is in history
Change-Id: I529392b06fc3db41ed86aca5563a34ec7ab1f2fc