Make getCurrentCountryIso null safe

Catch case if CountryDetector isn't available or detectCountry()
returns null; in this case use Locale.getDefault().getCountry()

Bug:9438025
Change-Id: I28fc0278342f6801e64ca07f7255cbd612d26ec1
1 file changed
tree: edbd854381f61e5bb4519216ef6561b8bd3f5e8c
  1. src/
  2. TestCommon/
  3. tests/