Merge "Fix the bug that queries UsageStatsService for locked users" into rvc-dev am: 24a1ea3f am: f1b80039 am: 374c3843 Change-Id: Ifbc485edf7804a6236ed7afb22a5ddf00844181f