Merge "Add the process oom adj score prior to the activity start" into tm-qpr-dev am: 9a7a0569

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



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