Merge "Resume next activity if pausing app died" into rvc-qpr-dev am: 813999adbd

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

Change-Id: Ie4ef8043dd947cc9e56fb6b970867089927a7f85