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

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



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