Merge "Refactor mixCriteria in AudioPolicyMix." am: 176be0e4 am: 70ffaa00 am: d2f589c0

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



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