Merge "Revert "[1/n] OomAdjuster implementation correctness and efficiency overhaul"" into main