Merge "Fix the bug that queries UsageStatsService for locked users" into rvc-dev am: 24a1ea3f03

Change-Id: Ie06ed2911c2a11ba36f30be1976054bf37b92fd6