Merge "Fix transfer splash screen view been called twice from onDraw" into sc-v2-dev am: 0c6450141f

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

Change-Id: If8a3b2bddc7583da65673258ae2fe1c64ab840a2