Merge "Don't transfer splash screen if activity is finishing." into tm-dev am: a56e6c1f am: 3a74786d

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

Change-Id: Ic8f402088ea41a6feccf321a94d484bea7cc5abd