[automerger skipped] Merge "Correct activity's lifecycle when the process was...

[automerger skipped] Merge "Correct activity's lifecycle when the process was killed in background." into 24D1-dev am: 0c1857ec -s ours

am skip reason: Merged-In I80756609fe643877971408934b19ad97aa0ae746 with SHA-1 667cafa6 is already in history

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



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