Merge "Return the correct roaming status when check isNetworkRoaming()" am: 1c1461c6a2 am: ef397808bf am: c989a1f4fd

Change-Id: I901800cc7b596f8b173e617223177cb889f62fb7