[automerger skipped] Merge "Revert^2 "Correct activity's lifecycle when the...

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

am skip reason: Merged-In I80756609fe643877971408934b19ad97aa0ae746 with SHA-1 bec26a07 is already in history. Merged-In was found from reverted change.

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

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



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