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