Merge "Merge \"Add colorSecondary theme attribute.\" into nyc-mr1-dev am: ddb980de05" into nyc-mr1-dev-plus-aosp