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

Change-Id: Ia4d898b86575f03932cfc8f249d1fb8579b5fa27