[automerger skipped] Merge "Refactor mixCriteria in AudioPolicyMix." am: 176be0e46f am: 70ffaa0043 am: d2f589c0b1 am: 575c6a832f am: 4be13a6488 -s ours
am skip reason: Merged-In I00c3cbb84fdef18fd98fa76d6572f7f971cfcf33 with SHA-1 67a70c4fe3 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>
This commit is contained in: