Merge "Fixes KeyButtonView to dismiss ripple after aborting for long press" into pi-dev
am: 12da48e095

Change-Id: I6402478fe38ba73f5e5e2a8b52e794f0a227bdf0