Merge "Fixes the flicker when transfer splash screen view to client" into sc-v2-dev am: f754d5df

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

Change-Id: I7bdc29f95f08f81bce7e434def06657ed45722cb