Merge "Implement getNetworkCountryIso in PhoneInterfaceManager." am: 836b0c12dc
am: 6167fa49cb

Change-Id: I91ff5ac13e25287c3c8bba5660e52efbf411d660