[automerger skipped] Resume next activity if pausing app died am: 9c62ef63...

[automerger skipped] Resume next activity if pausing app died am: 9c62ef63 -s ours am: 1341ae4b -s ours

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

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

Change-Id: I9ffb771013079f7b59ba3dadddbd5f8ccd5ab5c0