[automerger skipped] Revert^2 "Correct activity's lifecycle when the process was killed in background." am: b7c1ba2d -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: Ie5a5098d4581229ae62b6d0af1ad23e3764c739a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>