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

Change-Id: I1b2ed5199e11b2a8169aa994c4b2a72620f262ff