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

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

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