Merge "Implement the legacy splash screen behavior" into sc-dev am: 2be72d03 am: fa0a9d0b

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

Change-Id: I9f4a3c7c55c9ee03a6e8255e433189133c110b14