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