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

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

Change-Id: I1ceb32d50127e6542393c15d4d11314ec70f77b4