Merge "Ensure ConnectionService death triggers disconnect tone."
am: 84135b5bf5

Change-Id: I151af52dcd29e1d68f701373df7e9f747cb7f57a