Merge "Add fontVariationSettings to TextView and TextAppearance in XML"