Merge "Work on issue #38242094: Activity manager oom adj computation seems broken" into oc-dev