Merge commit 'a59551bade6a7b0c916c277f044de79c6af1bd22' into eclair-plus-aosp * commit 'a59551bade6a7b0c916c277f044de79c6af1bd22': Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion.
Merge commit 'a59551bade6a7b0c916c277f044de79c6af1bd22' into eclair-plus-aosp * commit 'a59551bade6a7b0c916c277f044de79c6af1bd22': Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion.