Merge "Handle a race condition between process killing and restarting" into sc-dev am: 5d4effc2 am: 384bec92

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

Change-Id: I1d93a9890f08a917facd35a2d41eea500058e2a3