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

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

Change-Id: Ic33c9756ee53db1a39b484bef8ce4b2286f37afe