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

* commit '15349991240bb9443d704b4ac85915f474e5108c':
  Pull roaming from mServiceState for consistency