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

Change-Id: If69caeaacd480686f5737e2f96d6804ef13ce380