[automerger skipped] Merge "AudioFlinger: Move sink config statics to the...

[automerger skipped] Merge "AudioFlinger: Move sink config statics to the interface" into main am: 8c667f49 am: 84281198 -s ours am: bc8e0136 -s ours am: b7af96e1 -s ours

am skip reason: Merged-In Ice6ee1a99515ad25f5270d9157a9edbabff767bb with SHA-1 55107599 is already in history

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



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