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

Change-Id: I6376c69016d82af6dfd558b73192ea0270bb9b8f