Merge "Fix issue with fontScale changes not taking effect" into oc-dev

am: 83c9413b75

Change-Id: I8afef55cae842c94c24c7cece1b8c5c90e6841c1

core/java/android/content/res/TypedArray.java

@@ -56,12 +56,13 @@ public class TypedArray {
         // Reset the assets, which may have changed due to configuration changes
         // or further resource loading.
         attrs.mAssets = res.getAssets();
+        attrs.mMetrics = res.getDisplayMetrics();
         attrs.resize(len);
         return attrs;
     }
 
     private final Resources mResources;
-    private final DisplayMetrics mMetrics;
+    private DisplayMetrics mMetrics;
     private AssetManager mAssets;
 
     private boolean mRecycled;