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

Change-Id: Ie931304d2e8eb77da1c1a9707b044c72daf3abbd