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

Change-Id: I8b3e357e0700947f3e4aad974d4a7e4f71430efe