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

Change-Id: I02410b92d08b82f877520a190d36eb8ad8d1d337