[automerger skipped] Merge "Configurable AudioPolicyEngine: Skip device count assert" am: 5410138c -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: I1885f7c66d765e6d86cc7d2e4277eabfff77c0d4