Merge "ActivityManager: process stop needs a process to stop"
am: e467620566

Change-Id: I9316853c0625b8a9f352f321208f0414184e2d43