am cf7bd883: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'cf7bd88327618664ea31bc9ee2cb76368d0de44b':
  alsa_audio: route call voice to phone when on HDMI
  alsa_sound: fix for SIP call mute issue.
  Revert "alsa_sound: fix for SIP call mute issue."
  alsa_sound: fix for SIP call mute issue.
  alsa_sound: fix for output device routing during video chat
  audio: add the headset tx
  hardware/alsa_sound: Change the device disable sequence
am 546bdab3: am 5f24fd93: alsa_sound: fix watchdog error issue

* commit '546bdab37dd2570cc1f4f5ecc89779ac4f6346d0':
  alsa_sound: fix watchdog error issue
am 5b689625: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '5b689625cf2aaefbdc4e56651c1f138be5417179':
am 14f773e8: am a8b76531: audio: fix for mismatched UseCase Type

* commit '14f773e88ca13d9279602cdcf81bf8c22c28e985':
  audio: fix for mismatched UseCase Type
am a1852d1b: am 87459f08: alsa_sound : audio path change to BUILT_IN_MIC for camcorder Tx

* commit 'a1852d1b2d42d3964400500aca80274d7e326d3b':
  alsa_sound : audio path change to BUILT_IN_MIC for camcorder Tx
am b9047ffc: am b357a77d: alsa_sound: Add hdmi audio sink capability discovery

* commit 'b9047ffce7e552901e367018d393e415fbc56c43':
  alsa_sound: Add hdmi audio sink capability discovery
am d0947edb: am bf1c8748: alsa_sound: Add support for multichannel hdmi

* commit 'd0947edb99697b88bc61f574eeef6041bda9022f':
  alsa_sound: Add support for multichannel hdmi
am 72f83fe8: am 2c798912: alsa_sound: avoid pcm_open error

* commit '72f83fe83242142ad3f10fb87f19e6d7d33b7c49':
  alsa_sound: avoid pcm_open error
am 694b033a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '694b033a0da0774a1a38e253cad536e4b1f897c2':
am f8b71955: am 89c224e2: alsa_sound: prevent lowlatency errors triggering WD reset

* commit 'f8b719552d3cf2cdb56ff8a08833438195835414':
  alsa_sound: prevent lowlatency errors triggering WD reset
am af528e0d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'af528e0d33cb13e868e6f6e951297564432e1c90':
am 9977042d: am 0f5426b3: alsa_sound: change voice-call stop sequence

* commit '9977042dba61b78fd536c87581cd5eea940866e1':
  alsa_sound: change voice-call stop sequence
am 03ef6dda: am 5062ccee: alsa_sound: change input device for communication

* commit '03ef6dda80829d0cfbd762643bd2a046869cc41b':
  alsa_sound: change input device for communication
am c26e258c: am 9eb1a4fc: audio: add support for HDMI and speaker combo device

* commit 'c26e258cea80ab7197e527d06097cd6999df49a9':
  audio: add support for HDMI and speaker combo device
am 9b41ac7b: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '9b41ac7ba55c0f6ee044ef1279941ab3fe1e2a06':
  Revert "alsa_sound: change voice-call stop sequence"
  alsa_sound: change voice-call stop sequence
am 49de8867: (-s ours) am 365ce897: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '49de886719b27d646c50a5171172bf0865387380':
am 7e5b6ac3: am 29555939: mm-audio: Fix delay with first voice call after bootup.

* commit '7e5b6ac34dec11d2e0be2b05272950618a7598cc':
  mm-audio: Fix delay with first voice call after bootup.
am a82c5b06: am 6ae807c4: mm-audio: Fix delay at the start of MT voice call

* commit 'a82c5b060666b74bdf4c1cee96034ab2fea37b94':
  mm-audio: Fix delay at the start of MT voice call
am 09f112b2: am 1c9f3b09: audio: separate calibration data for TMUS

* commit '09f112b25fadce8defdc91c8f9a3e6c538034776':
  audio: separate calibration data for TMUS
am b1744367: am e365ed0c: mm-audio: Change delay value when setting device in call mode

* commit 'b17443674f6c5fe12f9658ceb40e357f2b5bbf2d':
  mm-audio: Change delay value when setting device in call mode