Merge "Fix zombie process issue caused by trace trigger" into main am: 81aff58732

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

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