[automerger skipped] Merge "Revert "Distinguish warm/hot launch by whether the...

[automerger skipped] Merge "Revert "Distinguish warm/hot launch by whether the activity has attached process"" into rvc-qpr-dev am: d4101321 am: 4332cd04 -s ours

am skip reason: Change-Id I18e2f1a5eaf1e07b96d6135be56f8077d37b7504 with SHA-1 d92b3605 is in history

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

Change-Id: I9b9f9b243db2852f7b6aff901bafba2ef97a9f52