Merge "Fix dismissing activity getting relaunch signal while dismissing split"...

Merge "Fix dismissing activity getting relaunch signal while dismissing split" into sc-v2-dev am: a07f72ca am: 9184cb52

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

Change-Id: I615545131dd2a1423312ae403887b8d8e59da79f