Merge "Skip splash screen exit animation if screen isn't on." into tm-dev am:...

Merge "Skip splash screen exit animation if screen isn't on." into tm-dev am: fe1b41da am: c875a67a

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



Change-Id: I811be0f5fa23f066ee09db069ea2f196624050a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>