Merge "Use Android data for MCC-based time zone lookup"

import com.android.internal.app.LocaleStore.LocaleInfo;

import libcore.icu.ICU;

import libcore.icu.TimeZoneNames;

import libcore.util.TimeZoneFinder;

import java.util.ArrayList;

import java.util.Arrays;

        if (entry == null) {

            return null;

        }

        Locale locale = new Locale("", entry.mIso);

        String[] tz = TimeZoneNames.forLocale(locale);

        if (tz.length == 0) return null;

        String zoneName = tz[0];

        /* Use Australia/Sydney instead of Australia/Lord_Howe for Australia.

         * http://b/33228250

         * Todo: remove the code, see b/62418027

         */

        if (mcc == 505  /* Australia / Norfolk Island */) {

            for (String zone : tz) {

                if (zone.contains("Sydney")) {

                    zoneName = zone;

                }

            }

        }

        return zoneName;

        final String lowerCaseCountryCode = entry.mIso;

        return TimeZoneFinder.getInstance().lookupDefaultTimeZoneIdByCountry(lowerCaseCountryCode);

    }

    /**