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

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

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