am 7587cb6e: resolved conflicts for merge of b942d6fb to mnc-dev-plus-aosp

* commit '7587cb6e5c686cbb9dd43fdad2234a98e56d3f5d':
  audio: Fix false positives in audio_is_remote_submix_device()