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

[automerger skipped] Merge "Distinguish warm/hot launch by whether the activity has attached process" into rvc-qpr-dev am: 2ef418cd am: 2e962006 -s ours

am skip reason: Change-Id Iaf53ab8a35192249c20a73d9cb0de2a5e8effc64 with SHA-1 2e039cd3 is in history

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

Change-Id: I4fdd5fa39b505294385a816a3a24f42521b137d2