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

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

Change-Id: I68c4e8a61a012f4f1bee3f91e9459c5f20de3cec