Merge "Return the correct roaming status when check isNetworkRoaming()" am: 1c1461c6 am: ef397808 am: c989a1f4 Change-Id: I901800cc7b596f8b173e617223177cb889f62fb7