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

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

Change-Id: I9f471ce48a0a5b5743024ddb11b7912c7857ece0