[automerger skipped] Merge "Perform oomAdjUpdate prior to scheduling service transactions" into sc-dev am: 72a09019 am: 898fd289 -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: Iccae8cafbfc04b397c93d6b7e506c4db18718d9a