[automerger skipped] Merge "Thread: Add safety annotations for methods" into...

[automerger skipped] Merge "Thread: Add safety annotations for methods" into main am: 93d4e880 am: 1c8ea410 -s ours

am skip reason: Merged-In I7245f0657e54f2230703febfef67fb2acfdc1b5a with SHA-1 94dfbb4f is already in history

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



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