Merge "UsageStatsService: ignore removed users in persistPendingEventsLocked()"