Merge "Skip transfer splash screen if activity is destroying or destroyed" into tm-dev am: cdb9f0c8 am: c48ea402

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

Change-Id: I4c8f84b5b7df057b30ce334a99ce4ce975080020