Merge "Fix issue that the disconnect tone doesn't sound from BTHS"
am: 0a17b57d1c

Change-Id: I99fd5ea475baa5b16c698de596169994d224f9fd