Merge "Clean up OomAdjusterModernImpl" into main