Merge "[BugFixed][OOM_ADJ] use max_adj to control process final adj" am: 2d361f6350 am: 5b474f61a2 am: 086bba93d7

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

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