Merge "Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am: 8bc0aa2559 am: 604c29006b" into oc-dr1-dev-plus-aosp