Merge "Touchpad Capture: Fix issues with Pointer Controller" am: 4aaa310584 am: e0aa154f30 am: ba6f333c7d

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1507695

Change-Id: Ia0827a9af44030c660c7ac1117e5cac552a7a64c