Merge "Merge "Fix issue with fontScale changes not taking effect" into oc-dev...
Merge "Merge "Fix issue with fontScale changes not taking effect" into oc-dev am: 83c9413b" into oc-dev-plus-aosp
am: a79d516e
Change-Id: Ib158c3a45ec89b7374418c064d7b46cc4ab8f551