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

Merge "Merge "Update to cold launch if the process is restarted during launching" into udc-dev am: 15371249 am: 590cea0a" into udc-d1-dev-plus-aosp am: e8c5cabc

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



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