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: 23388093

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

Change-Id: I26f562c4856851b316a5ae8eeecb9d221d078454