Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev am: f3562ffdfb
am: 18d64cf8fe

Change-Id: I58ccad1327cf6153c5acc8e498aaaa44b8bfd6c6