Merge "Skip resetting the shouldNotFreeze flag while re-evaluating oom adj" into sc-dev