[automerger skipped] Merge "Add the process oom adj score prior to the...

[automerger skipped] Merge "Add the process oom adj score prior to the activity start" into tm-qpr-dev am: 9a7a0569 am: 321c45c9 -s ours

am skip reason: Merged-In Ie854738dbee953eb235ef29a5b4b5dbcd507001d with SHA-1 76dcb12d is already in history

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



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