[automerger skipped] APC: Add possible deadlock fix when creating track am: 4ec78f5b -s ours

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

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



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