[automerger skipped] Merge "APC: Add possible deadlock fix when creating...

[automerger skipped] Merge "APC: Add possible deadlock fix when creating track" into main am: a8fb9121 am: d4ec6b06 am: 8cc984d6 am: 6aef5068 -s ours

am skip reason: Merged-In I16555608176f1b1dfa180e82346319b55c19de01 with SHA-1 4ec78f5b is already in history

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



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