Fix a scenario where Bluetooth Autoconnect fails. am: b5ae55f5c2
am: 15f55cec71

Change-Id: Iade648e2940beb48f33e985dac539e4a8fcfb463