[automerger skipped] Merge "Accessing tee patches with holding the thread...

[automerger skipped] Merge "Accessing tee patches with holding the thread lock." into main am: ba4fb629 -s ours am: f175e2a1 -s ours

am skip reason: Merged-In Ia704350ed5b3c914448ee609da33b867e3aa7626 with SHA-1 7434e816 is already in history

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



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