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

Change-Id: I91382d8765778498570ead3241237daccbb26816