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

[automerger skipped] Merge "Hold thread lock before calling updateSecondaryOutputsForTrack_l." into udc-dev am: 6e5663fe am: 70ad4f14 -s ours am: 93c0742c -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: I485f5736fe8d601413864b4c2341f4bfc539aa95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>