[automerger skipped] Merge "Refactor mixCriteria in AudioPolicyMix." am:...

[automerger skipped] Merge "Refactor mixCriteria in AudioPolicyMix." am: 176be0e4 am: 70ffaa00 am: d2f589c0 am: 575c6a83 am: 4be13a64 -s ours

am skip reason: Merged-In I00c3cbb84fdef18fd98fa76d6572f7f971cfcf33 with SHA-1 67a70c4f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2238516



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