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

[automerger skipped] Merge "AudioFlinger: Move sink config statics to the interface" into udc-dev-plus-aosp am: 01acaa3c am: 34591edb -s ours

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

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



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