Merge "Merge "Cancel animation and jump to current state if not animating...
Merge "Merge "Cancel animation and jump to current state if not animating picker" into nyc-dev am: d8c38b89 am: 784aa149" into nyc-mr1-dev-plus-aosp
am: d75d7a5a
* commit 'd75d7a5a':
Change-Id: I5d26f2d7d2c24fe1765563071ad73c41707febcd