[automerger skipped] Merge "Avoid killing task process after its activity was...

[automerger skipped] Merge "Avoid killing task process after its activity was died" into main am: 637ec738 am: 1940f94f -s ours

am skip reason: Merged-In I8cf8d67cc7cd39b6cc8db91498dc901f494ae85e with SHA-1 be9dd94e is already in history

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



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