Merge "Update CTS for getNetworkCountryIso by checking service state" into stage-aosp-tm-ts-dev