Merge "Forcing software in header button background ripples. am: 18227e4831 am: 170a0c9a57" into nyc-mr1-dev-plus-aosp