Merge "Use config_headlineFontFeatureSettings for lockscreen clock" into oc-dr1-dev