Merge "[automerger skipped] Merge "Perform oomAdjUpdate prior to scheduling...

Merge "[automerger skipped] Merge "Perform oomAdjUpdate prior to scheduling service transactions" into sc-dev am: 72a09019 am: 898fd289 -s ours" into sc-v2-dev-plus-aosp am: 8583ffcb -s ours

am skip reason: Merged-In I32271adbe75afe377014f036e017667a7857dbf9 with SHA-1 eb3c49a8 is already in history

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

Change-Id: I6621c67e969f6cde6f2bb780b0a74d496a16c858