Merge "Remove the timeout which used for cleanup splash screen" into sc-dev am: 4a1f7990 am: 26d83427

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

Change-Id: I7e7bc0923bc16937f8dae8ead92411fa3c105b41