Merge "Revert^2 "OomAdjuster Freeze Handling with CPU capability"" into main