tree 1e94b4a960dace150f682745ec54ba49325ddecd
parent 9128775d94298985a47dadb468c04a6f3c1aa5df
parent fe1c833502cc95ca8882eb9a8cea8caf8687b468
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583517784 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583517784 +0000

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

Change-Id: I93b0f801ec6ec4958ff0e083ea21ac7761eb9faf