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

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

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



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