Merge "Configurable AudioPolicyEngine: Skip device count assert"