Merge "AdapterService: Only bind HeadsetService in ON state." into pi-dev
am: 4e3076b1a2

Change-Id: I49ea80ea95e5c0a3351fb95fff84140298592356