[automerger skipped] Merge "Fix coordinate error after rotation and scaling in TouchInputMapper" am: 7de7b8c5d9 am: 0593880b35 am: f6de3856da -s ours

am skip reason: Change-Id I2d428fcbdc4bb879525754aafef05ebebbf131c5 with SHA-1 a36b28e432 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84ea9ca54d3beafb9853e5649c01254ca330e65a