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

Change-Id: I378ef5955fb49c5c300ce48c49e657d75797a35c