Merge "Fix a multi device Bluetooth connection scenario." into oc-mr1-dev am: a66ad2edc7
am: 181d78416f

Change-Id: Ic056b4b7c802eec63cd07ba15560346be7e93464