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

Change-Id: I685414fdbf476fd305f5219e20050652d0e3be51