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

[automerger skipped] Merge "APC: Add possible deadlock fix when creating track" into udc-qpr-dev-plus-aosp am: b8bf4173 -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: I79820511cd0c19f263c0a6d11f9ec9f119a8cabd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>