Merge "Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am: 8bc0aa25 am: e155b7ca" into oc-dr1-dev-plus-aosp