Merge "Update public style/attr definitions" into nyc-support-25.1-dev
am: 399df01ebb

Change-Id: Iafd69dd6d4cbdbc8378d3135f9eca9679e2d2769