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