Merge "Merge "Fix the bug that queries UsageStatsService for locked users" into rvc-dev am: 24a1ea3f am: 779812c6" into rvc-d1-dev-plus-aosp