Merge "Statsd: ISOLATED_UID_CHANGED out of batterystats"