[automerger skipped] Merge "AudioFlinger: Extract TeePatch" into...

[automerger skipped] Merge "AudioFlinger: Extract TeePatch" into udc-dev-plus-aosp am: 31050dc2 am: f7530c94 -s ours

am skip reason: Merged-In I88576005a266fd6beeabec873a2d531a65dcf9fd with SHA-1 6bad18ae is already in history

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



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