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

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

Change-Id: Ice321764974d67738fd6e99e50aba670ea766f66