am c8869f93: (-s ours) am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

* commit 'c8869f93928277e4a5e8867c955b733f9c241723':