Merge "Skip transfer splash screen if activity is destroying or destroyed"...

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

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

Change-Id: I22d64b4b13743f1dc8344f0582a2bb2713a8ceba