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 am: 57d93756

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

Change-Id: Iee366147707f85ea157ed473c14c3095b6d5b268