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

[automerger skipped] Merge "Thread: Add ThreadBase_ThreadLoop capability" into main am: 6965d391 am: d2ba9637 -s ours

am skip reason: Merged-In I6fb87cc8d362c5ddd928563f193fd43f0d02a04c with SHA-1 160664b4 is already in history

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



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