Merge changes from topic "ToupadPointerCapture" am: be23210bbe

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

Change-Id: I93ff323ef37d19fb34265fec09bc9d4f7ecd5980