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

Change-Id: I93b0f801ec6ec4958ff0e083ea21ac7761eb9faf