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

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



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