Merge "Revert "Reattach OomAdjuster rewrite flag (attempt 2)"" into main