Merge "APC: Add possible deadlock fix when creating track" into main am: a8fb9121 am: d4ec6b06

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



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