Merge "Replace usage of DPM supervision methods in UsageStatsService with calls to SupervisionManagerInternal. Part 2." into main