Merge "Increment a MetricsLogger counter on back press." into cw-f-dev
am: 523c4fd695

Change-Id: I2928fafd79f08500c7369691985f6b8b726433c1