Merge "Revert "Aligning Android color tokens with Material"" into main