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

Change-Id: I4d5c511c043048e79b4846febda85f521fb59f31