[automerger skipped] Refactor mixCriteria in AudioPolicyMix. am: d6c96014...

[automerger skipped] Refactor mixCriteria in AudioPolicyMix. am: d6c96014 am: 34f7cabd am: 0a39c615 am: ecc94e52 am: 5514459e -s ours

am skip reason: Merged-In I140c41acbea0f5b88d71587d7633db4e7ceee847 with SHA-1 069787e7 is already in history

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



Change-Id: I2df7eac831bbf3c68ce16736e857c0245dd858e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>