Merge "Avoid killing task process after its activity was died" into main am: 637ec738

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



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