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

Change-Id: Ibe51fa7e9fd139b27ff61f1be60412a4bd272386