[automerger skipped] Merge "Decouple the configuration from the...

[automerger skipped] Merge "Decouple the configuration from the AudioPolicyManager" into udc-dev am: 9c65d642 am: 07ac9892 am: 843d0c78 -s ours am: 0a331851 -s ours

am skip reason: Merged-In I334d16e762499a0292540e6abae4e177480d6235 with SHA-1 b0fbc1b4 is already in history

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



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