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

Change-Id: Ifbc485edf7804a6236ed7afb22a5ddf00844181f