Merge "Update to cold launch if the process is restarted during launching"...

Merge "Update to cold launch if the process is restarted during launching" into udc-qpr-dev am: c1cfc4a9 am: f47d8478

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



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