Merge "Avoid OOM Adj update for processes with fixed adj." into udc-dev am: 1b3a3c65e1

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

Change-Id: Ib340da4034cf17cd342fc8d59ab9aa859de49656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/am/OomAdjuster.java

@@ -837,7 +837,7 @@ public class OomAdjuster {
      */
     @GuardedBy("mService")
     void enqueueOomAdjTargetLocked(ProcessRecord app) {
-        if (app != null) {
+        if (app != null && app.mState.getMaxAdj() > FOREGROUND_APP_ADJ) {
             mPendingProcessSet.add(app);
         }
     }