[automerger skipped] Merge "Fix zombie process issue caused by trace trigger"...

[automerger skipped] Merge "Fix zombie process issue caused by trace trigger" into main am: 81aff587 am: f6d2e118 -s ours am: 2e64e03b -s ours

am skip reason: Merged-In Ie8fe67a14034149dbebddf7931bc2e1d2f12d1fe with SHA-1 9b408868 is already in history

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



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