Removing some animation special casing for 2-button mode

This would simplify reusing the same code for 3-button mode

Test: Verified on device
Bug: 175137718
Change-Id: Ia757eec069efc251475baa6af38c690431325f66
4 files changed