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

* commit '9e280c447f5f8747f7c4777d80d5dd7c25e7713e':
  Pull roaming from mServiceState for consistency