Merge "C2SoftHevcDec: Initialize mStride after first header decode" am: 9e2e53d5bf am: 1329bd5a0d am: 03d20a0ccc

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2172717

Change-Id: I6b4ffd71cfffddd4d4f4d6465ea6ef7d624ca0d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>