Merge "Obtain the ICU version from ICU4J instead of ICU4C"

import android.app.timezone.RulesManager;

import android.app.timezone.RulesState;

import android.content.Context;

import android.icu.util.TimeZone;

import android.os.ParcelFileDescriptor;

import android.os.RemoteException;

import android.util.Slog;

import com.android.timezone.distro.TimeZoneDistro;

import com.android.timezone.distro.installer.TimeZoneDistroInstaller;

import libcore.icu.ICU;

import libcore.timezone.TimeZoneDataFiles;

import libcore.timezone.TimeZoneFinder;

import libcore.timezone.TzDataSetVersion;

                            // Report the active rules version (i.e. the rules in use by the current

                            // process).

                            pw.println("Active rules version (ICU, ZoneInfoDB, TimeZoneFinder): "

                                    + ICU.getTZDataVersion() + ","

                                    + TimeZone.getTZDataVersion() + ","

                                    + ZoneInfoDB.getInstance().getVersion() + ","

                                    + TimeZoneFinder.getInstance().getIanaVersion());

                            break;

        pw.println("RulesManagerService state: " + toString());

        pw.println("Active rules version (ICU, ZoneInfoDB, TimeZoneFinder): "

                + ICU.getTZDataVersion() + ","

                + TimeZone.getTZDataVersion() + ","

                + ZoneInfoDB.getInstance().getVersion() + ","

                + TimeZoneFinder.getInstance().getIanaVersion());

        pw.println("Distro state: " + rulesState.toString());