Merge "Release the SurfacePackageViewHost on splash screen removed" into sc-dev am: dc07d29b am: ab9a4b9a am: c56e7197

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

Change-Id: I81d9b577466ba49fd8b2309d0b5b396b59b47ff5