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

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

Change-Id: I7442909ae7562d16cbaa6e90107d798a8939266e