Merge "Fix incorrect getDeviceAndMixForInputSource matching logic" am: d28d8d4972 am: 9db0bd28f4

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

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