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