Merge "Change SplashscreenTests for freeform first devices" into stage-aosp-sc-ts-dev