[automerger skipped] Merge "Fix process capabilities on re-computation for...

[automerger skipped] Merge "Fix process capabilities on re-computation for cycles in oomAdjuster" into sc-v2-dev am: af6b3f30 am: 6dd34c5a -s ours

am skip reason: Merged-In Ia7d0ec7a39aac5bf59ae837b4af1ed7b6512521c with SHA-1 93f9b8b8 is already in history

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

Change-Id: Ib878e81e5a98c93b29a70513b962c0546cecedaa