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

[automerger skipped] Resume next activity if pausing app died am: 9c62ef63 am: 2f5ebc89 -s ours am: 55e952de -s ours

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

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

Change-Id: I908d442d88b3c6927c9fdb6ed8d10ab76daacab9