am 81ab90f2: am 9e280c44: am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev

* commit '81ab90f2173c8afac82a22c2cca72eb90293de9a':
  Pull roaming from mServiceState for consistency