[automerger skipped] APC: Add possible deadlock fix when creating track am:...

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

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

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



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