[automerger skipped] Merge "Fixes the flicker when transfer splash screen view...

[automerger skipped] Merge "Fixes the flicker when transfer splash screen view to client" into sc-v2-dev am: f754d5df am: 82059eb9 -s ours

am skip reason: Merged-In I03c600afdc477ca0c8064b215f2b361468db9f3c with SHA-1 74f1d7ba is already in history

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

Change-Id: I9353c33008715363353563bb77b130332a2492f8