Merge "C2SoftMpeg2Dec: Fix KEEP_THREADS_ACTIVE issue" into main am: 8314192e81 am: 1f47ad86b2

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

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