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

Change-Id: I533f9311045ed13d64d60cee85641f25de3371b1