[automerger skipped] Merge "Configurable AudioPolicyEngine: Skip device count...

[automerger skipped] Merge "Configurable AudioPolicyEngine: Skip device count assert" am: 5410138c -s ours am: 9c093a7a -s ours am: 7524e77b -s ours am: f7318639 -s ours am: 02972163 -s ours am: 667ac8c2 -s ours

am skip reason: Merged-In Iaab1baaa89b45e7f3380721629413c987e329132 with SHA-1 87440d8a is already in history

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

Change-Id: Ib82ae14af55aef10cf0904ed12bc10feb65f1682