[automerger skipped] Merge "Resume next activity if pausing app died" into...

[automerger skipped] Merge "Resume next activity if pausing app died" into rvc-qpr-dev am: 813999ad am: 8b47e63e -s ours

am skip reason: Change-Id I635fceb9cf7b782f6ffbb9ebef7cb69053f64a0b with SHA-1 f191f9a7 is in history

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

Change-Id: I6c66e7134fe37c3c7ef084b79fbe1f846c479616