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

Change-Id: I447044f9249b31be112f53ba74b98a4aff887f86