Merge commit '949c572a16881aa40079a42bf7682637b23eb16a' into eclair-mr2-plus-aosp * commit '949c572a16881aa40079a42bf7682637b23eb16a': Issue 2265163: Audio still reported routed through earpiece on sholes
Merge commit '949c572a16881aa40079a42bf7682637b23eb16a' into eclair-mr2-plus-aosp * commit '949c572a16881aa40079a42bf7682637b23eb16a': Issue 2265163: Audio still reported routed through earpiece on sholes