Merge "Skip resetting the shouldNotFreeze flag while re-evaluating oom adj" into sc-dev am: 98b57c30 am: 973a6b26

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15141325

Change-Id: I41963e6e243749cd1115df2bde3f25afa546cd03