Merge changes from topic "ToupadPointerCapture" am: be23210bbe am: 888e5ea116

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

Change-Id: I9c0b1578364c981f76a5f1bf67d06969cc9d4d79