Merge \"Merge \\\"Set fontScale in override config to be equal to global.\\\"...
Merge \"Merge \\\"Set fontScale in override config to be equal to global.\\\" into nyc-dev am: c9adac6a am: c4d9ea85\" into nyc-mr1-dev-plus-aosp
am: eebd5b2a
Change-Id: I651fe1bb8c1a7143b8d80bcf8469227c8877c71c