Revert "Fix can't enable speaker with bluetooth headset"

* Replaced by different upstream fix

This reverts commit 76459f16219514fd973ed169962095221dc15adf.

Change-Id: I7d08eae8b0cf6153cacbc48b65752517b3258d62
2 files changed