Merge "Re-compute oom adj in case cycles are found in partial update" into...

Merge "Re-compute oom adj in case cycles are found in partial update" into sc-dev am: f6d97cfa am: 2fd1f901

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

Change-Id: Iaf9f98fc171cc637c3f9929876001a562a5d5f95