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

Change-Id: I45e58aa1a1ac7b5319a891e3d4f449099b13384d