Merge "Aligning Android color tokens with Material" into main