[automerger skipped] Merge changes from topic "ToupadPointerCapture" am:...

[automerger skipped] Merge changes from topic "ToupadPointerCapture" am: be23210b am: 888e5ea1 am: 1f1a42b5 am: 44c9a212 -s ours

am skip reason: Change-Id I3a02400eb648fd4d5dc96a21c5d929e4f9a2428a with SHA-1 8fa17283 is in history

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

Change-Id: I37cdb616dd2bd8fb147c838c33f1714930572a39