Merge "Avoid activity stopped when relaunching it to resumed" into sc-dev am:...

Merge "Avoid activity stopped when relaunching it to resumed" into sc-dev am: 09c06548 am: 2c1ca5d8

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

Change-Id: I41ccbcbc6c148c9bba5007bd665c0d73757b1ec4