Merge "Configurable AudioPolicyEngine: Skip device count assert" into sc-dev