Merge "Hold thread lock before calling updateSecondaryOutputsForTrack_l." into...

Merge "Hold thread lock before calling updateSecondaryOutputsForTrack_l." into udc-dev am: 6e5663fe

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



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