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