am 217d4568: am 8100b3fa: am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

* commit '217d45685f176c7a2584b32a484c644f9f921265':
  Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest