[automerger skipped] am d925573a: (-s ours) Merge "DO NOT MERGE - Support disconnecting while trying to connect." into lmp-preview-dev am: f052469c7b -s ours

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: Icec76a3064e9370a9926fdc32aab67d94a341bf4