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-dev am: 15371249 am: 594dd2e4 am: 3f4d5ed6 am: c337cf5f

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



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