am 131c5e08: am a59551ba: Merge "Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion." into eclair

Merge commit '131c5e0867d542788cf2dab23b17f2f8cc3d0391'

* commit '131c5e0867d542788cf2dab23b17f2f8cc3d0391':
  Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion.