Merge "Fix process capabilities on re-computation for cycles in oomAdjuster" into sc-v2-dev am: af6b3f3087

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

Change-Id: I71d644657327dd1fd217d717efbdfa8177021c45