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

Change-Id: I6c9bff56660ec6b6bddc48da9f629a571c7fe2d6