[automerger skipped] Merge "Hold thread lock before calling...

[automerger skipped] Merge "Hold thread lock before calling updateSecondaryOutputsForTrack_l." into udc-dev am: 6e5663fe am: 50d49afd am: 4eba5298 -s ours

am skip reason: Merged-In Ifddfb3d0e7f8057c3553b4ac1717fcc9bb6b53c7 with SHA-1 8799135b is already in history

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



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