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

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

Change-Id: I509b68c9fb28ec6a0611a87e3667210c0389f9fa