[automerger skipped] Decouple the configuration from the AudioPolicyManager am: 68e3f64e -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: I196b608fc2634df63dcb72d8c5ef12bf08c0a1dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>