Merge "Merge "Remove SplashScreen animations on TV" into tm-dev am: 07943a5b...

Merge "Merge "Remove SplashScreen animations on TV" into tm-dev am: 07943a5b am: 157a1a62" into tm-d1-dev-plus-aosp am: f3cf657e am: 6c0ee159

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



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