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

Change-Id: I343d200b87ed8dfc4bd8cc04b5a33a5f0d42ea06