Merge "Update for SetProcessMemory removal." am: ff331cf38c am: 1fba934036 am: 13733af595

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2067696

Change-Id: If4162e1f9b1e1427af8b5f73ca87c126edeb74cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>