Merge "Set the device_config_sync baseline back for FrameworksCoreTests"