Merge "Fixes ManagedUserContentResolverTest for automotive." into sc-v2-dev