[automerger skipped] Merge "Accessing tee patches with holding the thread lock." into main am: ba4fb62946 -s ours am: f175e2a175 -s ours am: 87eea0ec3b -s ours

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

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

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