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

[automerger skipped] Merge "Hold thread lock before calling updateSecondaryOutputsForTrack_l." into udc-dev am: 6e5663fe am: 7a682fa9 -s ours

am skip reason: Merged-In Ifddfb3d0e7f8057c3553b4ac1717fcc9bb6b53c7 with SHA-1 0455f691 is already in history

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



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