Merge "AdapterService: Only bind HeadsetService in ON state."
am: 44bafe6837

Change-Id: I1b6c2afc09c5eefd44efb0137fa4e466239839ca