Merge "Ensure we pass the pointer id to the velocity tracker and not the index" into sc-dev am: be2a0989ce am: 4af9bd7f05

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14940326

Change-Id: I8158d8a083c5b593e93b20c356e4a232cc3c17a3