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

Change-Id: Ia38edac1b704a8c802c7221cbd972be07644ee5c