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: I407a34d5a1200d89e948b14e8904704230434978