Merge "Update Paint#mFontVariationSettings in set() and reset()" into oc-dev

am: d865c624bd

Change-Id: I45e58aa1a1ac7b5319a891e3d4f449099b13384d

graphics/java/android/graphics/Paint.java

@@ -529,6 +529,7 @@ public class Paint {
         setTextLocales(LocaleList.getAdjustedDefault());
         setElegantTextHeight(false);
         mFontFeatureSettings = null;
+        mFontVariationSettings = null;
     }
 
     /**
@@ -565,6 +566,7 @@ public class Paint {
         mBidiFlags = paint.mBidiFlags;
         mLocales = paint.mLocales;
         mFontFeatureSettings = paint.mFontFeatureSettings;
+        mFontVariationSettings = paint.mFontVariationSettings;
     }
 
     /** @hide */