Merge "Revert "Fix Button[.Borderless].Colored text styling"" into nyc-support-24.1-dev
am: 9709aee3fb

Change-Id: Ib10100dad70ae974a95b0dc4ea0432810f63e41e