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

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

Change-Id: I4847074bce4cbb934853ca852ff434e96aa2d14e