Merge "Wrap some calls out of OomAdjuster with the injector" into main