[automerger skipped] Merge "AudioFlinger: Extract TeePatch" into main am: c4670a1091 am: c67cb6220d -s ours

am skip reason: Merged-In I88576005a266fd6beeabec873a2d531a65dcf9fd with SHA-1 09788e278f is already in history

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

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