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

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

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