Merge "Create a class in SettingsLib that creates an EnforcedAdmin that uses the correct supervision component, even after we have moved away from profile owner." into main