[automerger skipped] Merge "Thread: Add ThreadBase_ThreadLoop capability" into...

[automerger skipped] Merge "Thread: Add ThreadBase_ThreadLoop capability" into main am: 6965d391 am: 981629d9 am: 0c4f9565 -s ours

am skip reason: Merged-In I6fb87cc8d362c5ddd928563f193fd43f0d02a04c with SHA-1 8d672e04 is already in history

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



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