Merge "Remove activity from unknown app if starting window is relayouted." into sc-dev am: cfde5c2b am: ad801195

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

Change-Id: Iaab2e400f7f40174b34c45a2b98d9e5ae0597161