Merge "Merge "Use colorAccent for profile_button." into nyc-mr1-dev am: f679329412 am: 099d69999f" into nyc-mr1-dev-plus-aosp