Revert "Fix up 'launch player on headset connection' option."

This reverts commit 939bffe385015c6c89938c8e6959d27df60f1ad8.

Change-Id: I22c5c6227df9faae6bf6e05a340e03284c7d0fd6
Merge "Revert "Fix up 'launch player on headset connection' option."" into android-4.4