am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev

* commit 'e7b18d2bab30ca257b63e9029c6e08b9700b89a6':
  Pull roaming from mServiceState for consistency