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

Change-Id: Idb8780fa2cee69a279dbcdf5d46acc5e4c8119d0