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

Change-Id: Ibda5e33c155e8c36a59b1030165404135f766c1f