[automerger skipped] Merge "Fix incorrect getDeviceAndMixForInputSource matching logic" am: d28d8d49 am: 9db0bd28 am: 1b4588d2 -s ours

am skip reason: Merged-In Ib4f2e8f3b4c8b39da5688f3d5ba2359af2868957 with SHA-1 28ed945b is already in history

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



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