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

Change-Id: I98ef598ca3260328cb65f2c619767acb61759a14